diff options
author | David S. Miller <davem@davemloft.net> | 2009-09-04 02:22:21 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-04 02:22:21 -0700 |
commit | a29889a5369d2604c2053bcd051519a2445d8a70 (patch) | |
tree | b17e8258894d079b4168994d9438ba7d6e7d1523 /arch/arm/plat-omap/dma.c | |
parent | e7a088f935180b90cfe6ab0aaae8a556f46885fe (diff) | |
parent | 37d0892c5a94e208cf863e3b7bac014edee4346d (diff) | |
download | op-kernel-dev-a29889a5369d2604c2053bcd051519a2445d8a70.zip op-kernel-dev-a29889a5369d2604c2053bcd051519a2445d8a70.tar.gz |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
-rw-r--r-- | arch/arm/plat-omap/dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 7677a4a..e3ac94f 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -946,7 +946,9 @@ void omap_start_dma(int lch) cur_lch = next_lch; } while (next_lch != -1); - } else if (cpu_class_is_omap2()) { + } else if (cpu_is_omap242x() || + (cpu_is_omap243x() && omap_type() <= OMAP2430_REV_ES1_0)) { + /* Errata: Need to write lch even if not using chaining */ dma_write(lch, CLNK_CTRL(lch)); } |