From: Syed Mohammed, Khasim <x0khasim@ti.com>
Date: Wed, 11 Jul 2007 12:26:48 +0000 (-0700)
Subject: OMAP:DSP: plat-omap dsp updates for 3430
X-Git-Tag: v2.6.22-omap1~2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=1784bab61f9979b7d5c561413184709b9f51ac83;p=linux-2.6-omap-h63xx.git

OMAP:DSP: plat-omap dsp updates for 3430

plat-omap dsp updates for 3430

Signed-off-by: Syed Mohammed Khasim <x0khasim@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/plat-omap/dsp/dsp_common.c b/arch/arm/plat-omap/dsp/dsp_common.c
index c5d634df4eb..633592a06d2 100644
--- a/arch/arm/plat-omap/dsp/dsp_common.c
+++ b/arch/arm/plat-omap/dsp/dsp_common.c
@@ -39,7 +39,8 @@
 
 #if defined(CONFIG_ARCH_OMAP1)
 #define dsp_boot_config(mode)	omap_writew((mode), MPUI_DSP_BOOT_CONFIG)
-#elif defined(CONFIG_ARCH_OMAP2)
+#endif
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 #define dsp_boot_config(mode)	writel((mode), DSP_IPI_DSPBOOTCONFIG)
 #endif
 
@@ -302,6 +303,12 @@ static int omap_dsp_init(void)
 		saram_base = OMAP24XX_SARAM_BASE;
 		saram_size = OMAP24XX_SARAM_SIZE;
 	}
+#endif
+#ifdef CONFIG_ARCH_OMAP34XX
+	/* To be Revisited for 3430 */
+	if (cpu_is_omap34xx()) {
+		return -ENODEV;
+	}
 #endif
 	if (dspmem_size == 0) {
 		printk(KERN_ERR "omapdsp: unsupported omap architecture.\n");
diff --git a/arch/arm/plat-omap/dsp/hardware_dsp.h b/arch/arm/plat-omap/dsp/hardware_dsp.h
index a15d9afa737..5af46f8b241 100644
--- a/arch/arm/plat-omap/dsp/hardware_dsp.h
+++ b/arch/arm/plat-omap/dsp/hardware_dsp.h
@@ -27,7 +27,7 @@
 #ifdef CONFIG_ARCH_OMAP1
 #include "omap1_dsp.h"
 #endif
-#ifdef CONFIG_ARCH_OMAP2
+#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3430)
 #include "omap2_dsp.h"
 #endif
 
diff --git a/arch/arm/plat-omap/dsp/omap2_dsp.h b/arch/arm/plat-omap/dsp/omap2_dsp.h
index 2e908357176..af93be204a4 100644
--- a/arch/arm/plat-omap/dsp/omap2_dsp.h
+++ b/arch/arm/plat-omap/dsp/omap2_dsp.h
@@ -36,7 +36,14 @@
 /*
  * DSP IPI registers: mapped to 0xe1000000 -- use readX(), writeX()
  */
+#ifdef CONFIG_ARCH_OMAP24XX
 #define DSP_IPI_BASE			DSP_IPI_24XX_VIRT
+#endif
+
+#ifdef CONFIG_ARCH_OMAP34XX
+#define DSP_IPI_BASE			DSP_IPI_34XX_VIRT
+#endif
+
 #define DSP_IPI_REVISION		(DSP_IPI_BASE + 0x00)
 #define DSP_IPI_SYSCONFIG		(DSP_IPI_BASE + 0x10)
 #define DSP_IPI_INDEX			(DSP_IPI_BASE + 0x40)