aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/dma.c
diff options
context:
space:
mode:
authorZebediah C. McClure <zmc@lurian.net>2009-03-23 21:07:44 -0400
committerTony Lindgren <tony@atomide.com>2009-03-23 21:51:19 -0400
commit557096fe2838778ec1c6df0186560ff21749f63d (patch)
treeb852792e29a5d8a06d4696c98c1d0aef9c27f94f /arch/arm/plat-omap/dma.c
parent56739a692946d4c2630cf287646ccaa67c828f47 (diff)
[OMAP850] Changes to memory subsystem
Changes to memory subsystem. Signed-off-by: Zebediah C. McClure <zmc@lurian.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/dma.c')
-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 47ec77af4ccb..dcc9e83a61ee 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -737,7 +737,7 @@ int omap_request_dma(int dev_id, const char *dev_name,
737 * id. 737 * id.
738 */ 738 */
739 dma_write(dev_id | (1 << 10), CCR(free_ch)); 739 dma_write(dev_id | (1 << 10), CCR(free_ch));
740 } else if (cpu_is_omap730() || cpu_is_omap15xx()) { 740 } else if (cpu_is_omap7xx() || cpu_is_omap15xx()) {
741 dma_write(dev_id, CCR(free_ch)); 741 dma_write(dev_id, CCR(free_ch));
742 } 742 }
743 743
@@ -2339,7 +2339,7 @@ static int __init omap_init_dma(void)
2339 printk(KERN_INFO "DMA support for OMAP15xx initialized\n"); 2339 printk(KERN_INFO "DMA support for OMAP15xx initialized\n");
2340 dma_chan_count = 9; 2340 dma_chan_count = 9;
2341 enable_1510_mode = 1; 2341 enable_1510_mode = 1;
2342 } else if (cpu_is_omap16xx() || cpu_is_omap730()) { 2342 } else if (cpu_is_omap16xx() || cpu_is_omap7xx()) {
2343 printk(KERN_INFO "OMAP DMA hardware version %d\n", 2343 printk(KERN_INFO "OMAP DMA hardware version %d\n",
2344 dma_read(HW_ID)); 2344 dma_read(HW_ID));
2345 printk(KERN_INFO "DMA capabilities: %08x:%08x:%04x:%04x:%04x\n", 2345 printk(KERN_INFO "DMA capabilities: %08x:%08x:%04x:%04x:%04x\n",