Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35c0dc38 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Tony Lindgren
Browse files

omap: sdma: Limit the secure reserve channel fix for omap3 



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: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
CC: Kalle Jokiniemi <kalle.jokiniemi@digia.com>
CC: Kevin Hilman <khilman@deeprootsystems.com>
Reviewed-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Reviewed-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 1ce0f9d4

arch/arm/plat-omap/dma.c

+2 −1
Original line number Diff line number Diff line
@@ -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;