diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-02-23 09:44:41 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:36:56 -0800 |
| commit | d82ba9954b6b2c4ac91ec6f6f42be8c5215d0619 (patch) | |
| tree | 7263d7d069fa725d8a5f14f9855052eb9af6184e | |
| parent | 82dfcbfe63500c80335d0cd5f91a35d4545a1fb2 (diff) | |
| download | op-kernel-dev-d82ba9954b6b2c4ac91ec6f6f42be8c5215d0619.zip op-kernel-dev-d82ba9954b6b2c4ac91ec6f6f42be8c5215d0619.tar.gz | |
OMAP4: dma: Correct CPU version check for dma_common_ch_end
CCDN is the last common channel register in all OMAP4 versions. Use
cpu_is_omap44xx() instead of the cpu_is_omap4430().
cpu_is_omap4430() returns 0 unconditionally. This causes that the
dma_common_ch_end register variable is not configured correctly on OMAP4, not
even for OMAP4430.
Because of this, registers between CCFN - CCDN will be not cleard in the
omap2_clear_dma function in OMAP4.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c index a59a45a..b19d849 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_omap4430()) + if (cpu_is_omap3630() || cpu_is_omap44xx()) dma_common_ch_end = CCDN; else dma_common_ch_end = CCFN; |
