summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/dma.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-30 11:03:22 -0700
committerTony Lindgren <tony@atomide.com>2012-10-31 15:37:13 -0700
commit8280960181eae6e4039957044577b6ef7154220f (patch)
treedd0590ac041d673f1fbc7a491d99997a6d785901 /arch/arm/mach-omap1/dma.c
parent32dee01e67e0d14e86708c4ca6c5a9f4f81d5144 (diff)
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-omap1/dma.c')
-rw-r--r--arch/arm/mach-omap1/dma.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index 71305c15fbd5..978aed85d328 100644
--- a/arch/arm/mach-omap1/dma.c
+++ b/arch/arm/mach-omap1/dma.c
@@ -321,6 +321,9 @@ static int __init omap1_system_dma_init(void)
d->dev_caps = ENABLE_1510_MODE;
enable_1510_mode = d->dev_caps & ENABLE_1510_MODE;
+ if (cpu_is_omap16xx())
+ d->dev_caps = ENABLE_16XX_MODE;
+
d->dev_caps |= SRC_PORT;
d->dev_caps |= DST_PORT;
d->dev_caps |= SRC_INDEX;