From: Richard Woodruff <r-woodruff2@ti.com>
Date: Tue, 8 May 2007 00:13:43 +0000 (-0700)
Subject: ARM: OMAP: Fix dsp mapping for 2430
X-Git-Tag: v2.6.22-omap1~179
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=6b94269123e2c3f8aead879c8a51a67c7e59fbfe;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix dsp mapping for 2430

This patch fixes the DSP mapping for 2430.

Signed-off-by: Richard Woodruff <r-woodruff2@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 5fa7fc2be03..a88bd1e46ae 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -74,12 +74,14 @@ static struct map_desc omap2_io_desc[] __initdata = {
 		.length		= DSP_MEM_24XX_SIZE,
 		.type		= MT_DEVICE
 	},
+#ifdef CONFIG_ARCH_OMAP2420
 	{
 		.virtual	= DSP_IPI_24XX_VIRT,
 		.pfn		= __phys_to_pfn(DSP_IPI_24XX_PHYS),
 		.length		= DSP_IPI_24XX_SIZE,
 		.type		= MT_DEVICE
 	},
+#endif
 	{
 		.virtual	= DSP_MMU_24XX_VIRT,
 		.pfn		= __phys_to_pfn(DSP_MMU_24XX_PHYS),
diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h
index 66592c8e76b..2f806b39131 100644
--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -34,10 +34,18 @@
 #endif
 
 /* DSP SS */
+#ifdef CONFIG_ARCH_OMAP2420
 #define OMAP24XX_DSP_BASE	0x58000000
 #define OMAP24XX_DSP_MEM_BASE	(OMAP24XX_DSP_BASE + 0x0)
 #define OMAP24XX_DSP_IPI_BASE	(OMAP24XX_DSP_BASE + 0x1000000)
 #define OMAP24XX_DSP_MMU_BASE	(OMAP24XX_DSP_BASE + 0x2000000)
+#endif
+
+#ifdef CONFIG_ARCH_OMAP2430
+#define OMAP24XX_DSP_BASE	0x5C000000
+#define OMAP24XX_DSP_MEM_BASE	(OMAP24XX_DSP_BASE + 0x0)
+#define OMAP24XX_DSP_MMU_BASE	(OMAP24XX_DSP_BASE + 0x1000000)
+#endif
 
 /* Mailbox */
 #define OMAP24XX_MAILBOX_BASE	(L4_24XX_BASE + 0x94000)