Merge branch 'for-2.6.36' into for-2.6.37

[karo-tx-linux.git] / arch / arm / mach-omap1 / devices.c

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index eb98eb8d3731c1ce51ff9aa0bc603be866e1c345..b583121b04b9ff221dbf3b859c833d674e9fcbde 100644 (file)
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -64,44 +64,7 @@ static void omap_init_rtc(void)
 static inline void omap_init_rtc(void) {}
 #endif
 
-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-
-#if defined(CONFIG_ARCH_OMAP15XX)
-#  define OMAP1_MBOX_SIZE      0x23
-#  define INT_DSP_MAILBOX1     INT_1510_DSP_MAILBOX1
-#elif defined(CONFIG_ARCH_OMAP16XX)
-#  define OMAP1_MBOX_SIZE      0x2f
-#  define INT_DSP_MAILBOX1     INT_1610_DSP_MAILBOX1
-#endif
-
-#define OMAP1_MBOX_BASE                OMAP16XX_MAILBOX_BASE
-
-static struct resource mbox_resources[] = {
-       {
-               .start          = OMAP1_MBOX_BASE,
-               .end            = OMAP1_MBOX_BASE + OMAP1_MBOX_SIZE,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = INT_DSP_MAILBOX1,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device mbox_device = {
-       .name           = "omap1-mailbox",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(mbox_resources),
-       .resource       = mbox_resources,
-};
-
-static inline void omap_init_mbox(void)
-{
-       platform_device_register(&mbox_device);
-}
-#else
 static inline void omap_init_mbox(void) { }
-#endif
 
 /*-------------------------------------------------------------------------*/
 
@@ -231,42 +194,7 @@ static inline void omap_init_spi100k(void)
 
 /*-------------------------------------------------------------------------*/
 
-#if defined(CONFIG_OMAP_STI)
-
-#define OMAP1_STI_BASE         0xfffea000
-#define OMAP1_STI_CHANNEL_BASE (OMAP1_STI_BASE + 0x400)
-
-static struct resource sti_resources[] = {
-       {
-               .start          = OMAP1_STI_BASE,
-               .end            = OMAP1_STI_BASE + SZ_1K - 1,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = OMAP1_STI_CHANNEL_BASE,
-               .end            = OMAP1_STI_CHANNEL_BASE + SZ_1K - 1,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = INT_1610_STI,
-               .flags          = IORESOURCE_IRQ,
-       }
-};
-
-static struct platform_device sti_device = {
-       .name           = "sti",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(sti_resources),
-       .resource       = sti_resources,
-};
-
-static inline void omap_init_sti(void)
-{
-       platform_device_register(&sti_device);
-}
-#else
 static inline void omap_init_sti(void) {}
-#endif
 
 #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)