linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / arm / mach-omap2 / devices.c

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index aa43224..7181edb 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -9,6 +9,7 @@
  * (at your option) any later version.
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -24,6 +25,10 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/gpio.h>
 
+extern void omap_nop_release(struct device *dev);
+
+/*-------------------------------------------------------------------------*/
+
 #if    defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
 
 #define OMAP2_I2C_BASE2                0x48072000
@@ -44,6 +49,9 @@ static struct resource i2c_resources2[] = {
 static struct platform_device omap_i2c_device2 = {
         .name           = "i2c_omap",
         .id             = 2,
+        .dev = {
+                .release        = omap_nop_release,
+        },
        .num_resources  = ARRAY_SIZE(i2c_resources2),
        .resource       = i2c_resources2,
 };
@@ -66,89 +74,6 @@ static void omap_init_i2c(void) {}
 
 #endif
 
-#if defined(CONFIG_OMAP_STI)
-
-#define OMAP2_STI_BASE         IO_ADDRESS(0x48068000)
-#define OMAP2_STI_CHANNEL_BASE 0x54000000
-#define OMAP2_STI_IRQ          4
-
-static struct resource sti_resources[] = {
-       {
-               .start          = OMAP2_STI_BASE,
-               .end            = OMAP2_STI_BASE + 0x7ff,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = OMAP2_STI_CHANNEL_BASE,
-               .end            = OMAP2_STI_CHANNEL_BASE + SZ_64K - 1,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = OMAP2_STI_IRQ,
-               .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_SPI_OMAP24XX)
-
-#include <asm/arch/mcspi.h>
-
-#define OMAP2_MCSPI1_BASE              0x48098000
-#define OMAP2_MCSPI2_BASE              0x4809a000
-
-/* FIXME: use resources instead */
-
-static struct omap2_mcspi_platform_config omap2_mcspi1_config = {
-       .base           = io_p2v(OMAP2_MCSPI1_BASE),
-       .num_cs         = 4,
-};
-
-struct platform_device omap2_mcspi1 = {
-       .name           = "omap2_mcspi",
-       .id             = 1,
-       .dev            = {
-               .platform_data = &omap2_mcspi1_config,
-       },
-};
-
-static struct omap2_mcspi_platform_config omap2_mcspi2_config = {
-       .base           = io_p2v(OMAP2_MCSPI2_BASE),
-       .num_cs         = 2,
-};
-
-struct platform_device omap2_mcspi2 = {
-       .name           = "omap2_mcspi",
-       .id             = 2,
-       .dev            = {
-               .platform_data = &omap2_mcspi2_config,
-       },
-};
-
-static void omap_init_mcspi(void)
-{
-       platform_device_register(&omap2_mcspi1);
-       platform_device_register(&omap2_mcspi2);
-}
-
-#else
-static inline void omap_init_mcspi(void) {}
-#endif
-
 /*-------------------------------------------------------------------------*/
 
 static int __init omap2_init_devices(void)
@@ -157,8 +82,6 @@ static int __init omap2_init_devices(void)
         * in alphabetical order so they're easier to sort through.
         */
        omap_init_i2c();
-       omap_init_mcspi();
-       omap_init_sti();
 
        return 0;
 }