diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-30 11:03:22 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-31 15:37:13 -0700 |
| commit | 8280960181eae6e4039957044577b6ef7154220f (patch) | |
| tree | dd0590ac041d673f1fbc7a491d99997a6d785901 /arch/arm/mach-omap2/dma.c | |
| parent | 32dee01e67e0d14e86708c4ca6c5a9f4f81d5144 (diff) | |
| download | op-kernel-dev-8280960181eae6e4039957044577b6ef7154220f.zip op-kernel-dev-8280960181eae6e4039957044577b6ef7154220f.tar.gz | |
ARM: OMAP: Remove cpu_is_omap usage from plat-omap/dma.c
This code will be eventually in drivers, and for the
code in the drivers we don't want to have any cpu_is_omap
usage. Those macros should be private to arch/arm/mach-omap1
and arch/arm/mach-omap2.
To fix this, let's move the define for dma_omap2plus()
to dma-omap.h, and use the existing dma_attr passed in
the platform_data as the revision registers are what they
are.
Note that we can now also remove the relative includes
introduced by the recent clean-up patches.
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/dma.c')
| -rw-r--r-- | arch/arm/mach-omap2/dma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c index b1926cd..e5aba58 100644 --- a/arch/arm/mach-omap2/dma.c +++ b/arch/arm/mach-omap2/dma.c @@ -276,6 +276,9 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) return -ENOMEM; } + if (cpu_is_omap34xx() && (omap_type() != OMAP2_DEVICE_TYPE_GP)) + d->dev_caps |= HS_CHANNELS_RESERVED; + /* Check the capabilities register for descriptor loading feature */ if (dma_read(CAPS_0, 0) & DMA_HAS_DESCRIPTOR_CAPS) dma_common_ch_end = CCDN; |
