aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2012-04-28 10:49:10 -0400
committerSantosh Shilimkar <santosh.shilimkar@ti.com>2012-05-08 02:24:24 -0400
commitd07c3df8019bf01306065c4271421d70ad23e5e8 (patch)
tree7557d06bf8953a613539df20a2e98eaf2ed08a35 /arch/arm/plat-omap
parent084753d18e6d2d95db21cc89514f225c8a7635b3 (diff)
ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching.
cpu_class_is_omap2() contains all OMAP2+ devices. So update the DMA code cpu checks accordingly so that there is no need to patch the file for any future OMAP2+ devices. In long run, all these attributes should come from hwmod dev_attr based on DMA IP version. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index ecdb3da0dea..c046a1942ef 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -843,7 +843,7 @@ omap_dma_set_prio_lch(int lch, unsigned char read_prio,
843 } 843 }
844 l = p->dma_read(CCR, lch); 844 l = p->dma_read(CCR, lch);
845 l &= ~((1 << 6) | (1 << 26)); 845 l &= ~((1 << 6) | (1 << 26));
846 if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx()) 846 if (cpu_class_is_omap2() && !cpu_is_omap242x())
847 l |= ((read_prio & 0x1) << 6) | ((write_prio & 0x1) << 26); 847 l |= ((read_prio & 0x1) << 6) | ((write_prio & 0x1) << 26);
848 else 848 else
849 l |= ((read_prio & 0x1) << 6); 849 l |= ((read_prio & 0x1) << 6);
@@ -2057,7 +2057,7 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev)
2057 } 2057 }
2058 } 2058 }
2059 2059
2060 if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx()) 2060 if (cpu_class_is_omap2() && !cpu_is_omap242x())
2061 omap_dma_set_global_params(DMA_DEFAULT_ARB_RATE, 2061 omap_dma_set_global_params(DMA_DEFAULT_ARB_RATE,
2062 DMA_DEFAULT_FIFO_DEPTH, 0); 2062 DMA_DEFAULT_FIFO_DEPTH, 0);
2063 2063