omap: sdma: Limit the secure reserve channel fix for omap3
authorSantosh Shilimkar <santosh.shilimkar@ti.com>
Thu, 18 Feb 2010 08:59:09 +0000 (08:59 +0000)
committerTony Lindgren <tony@atomide.com>
Tue, 23 Feb 2010 18:57:40 +0000 (10:57 -0800)
The commit 'ba50ea7e' reserves DMA channels 0 and 1 on high
security devices, in order to avoid collision between kernel
dma transfers and ROM code dma transfers.

This fix is applicable only for OMAP3 so add an appropriate
check.

Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
CC: Kalle Jokiniemi <kalle.jokiniemi@digia.com>
CC: Kevin Hilman <khilman@deeprootsystems.com>
Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com>
Reviewed-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/plat-omap/dma.c

index 5ec96db..049165c 100644 (file)
@@ -2149,7 +2149,8 @@ static int __init omap_init_dma(void)
                        DMA_SYSCONFIG_AUTOIDLE);
                dma_write(v , OCP_SYSCONFIG);
                /* reserve dma channels 0 and 1 in high security devices */
-               if (omap_type() != OMAP2_DEVICE_TYPE_GP) {
+               if (cpu_is_omap34xx() &&
+                       (omap_type() != OMAP2_DEVICE_TYPE_GP)) {
                        printk(KERN_INFO "Reserving DMA channels 0 and 1 for "
                                        "HS ROM code\n");
                        dma_chan[0].dev_id = 0;