On Fri, May 4, 2012 at 3:17 AM, Kevin Hilman <khilman@xxxxxx> wrote: > Santosh Shilimkar <santosh.shilimkar@xxxxxx> writes: > >> 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@xxxxxx> >> --- >> arch/arm/mach-omap2/dma.c | 2 +- >> arch/arm/plat-omap/dma.c | 4 ++-- >> 2 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c >> index b19d849..2750bb9 100644 >> --- a/arch/arm/mach-omap2/dma.c >> +++ b/arch/arm/mach-omap2/dma.c >> @@ -227,7 +227,7 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) >> >> dma_stride = OMAP2_DMA_STRIDE; >> dma_common_ch_start = CSDP; >> - if (cpu_is_omap3630() || cpu_is_omap44xx()) >> + if (omap_rev() >= OMAP3630_REV_ES1_0) > > It's not obvious (at least to me) that this is equivalent. > > For example, this will now be true on the TI81xx devices. > I see your point. On second thought, i decided to drop this hunk from the patch since the availability of the dma descriptor feature can be read from dma capability register. Will post another patch for it and also add it to the clean-up series. Updated $subject patch in the end of email. Regards Santosh >From e42966bc56b1603e033b5b259564ae149b11a5d9 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar <santosh.shilimkar@xxxxxx> Date: Sat, 28 Apr 2012 20:19:10 +0530 Subject: [PATCH 4/7] 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@xxxxxx> --- Dropped the hunk for descriptor feature check based on OMAP cpu version since it can be handled with DMA hardware capability register read. arch/arm/plat-omap/dma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index ecdb3da..c046a19 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, } 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); -- 1.7.5.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
