ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching.
authorSantosh Shilimkar <santosh.shilimkar@ti.com>
Sat, 28 Apr 2012 14:49:10 +0000 (20:19 +0530)
committerSantosh Shilimkar <santosh.shilimkar@ti.com>
Tue, 8 May 2012 06:24:24 +0000 (11:54 +0530)
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>
arch/arm/plat-omap/dma.c

index ecdb3da0dea93704086df1f83dff342813c3afd3..c046a1942ef76c043dd3a3e26f4d789e86804c01 100644 (file)
@@ -843,7 +843,7 @@ omap_dma_set_prio_lch(int lch, unsigned char read_prio,
        }
        l = p->dma_read(CCR, lch);
        l &= ~((1 << 6) | (1 << 26));
-       if (cpu_is_omap2430() || cpu_is_omap34xx() ||  cpu_is_omap44xx())
+       if (cpu_class_is_omap2() && !cpu_is_omap242x())
                l |= ((read_prio & 0x1) << 6) | ((write_prio & 0x1) << 26);
        else
                l |= ((read_prio & 0x1) << 6);
@@ -2057,7 +2057,7 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev)
                }
        }
 
-       if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx())
+       if (cpu_class_is_omap2() && !cpu_is_omap242x())
                omap_dma_set_global_params(DMA_DEFAULT_ARB_RATE,
                                DMA_DEFAULT_FIFO_DEPTH, 0);