Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-ux500 / devices-db8500.c

diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 4a94be3304b91a852a7732d5b6e8eeda5b37866d..23c695d54977d7a551d06fdb529f28d4195c4efe 100644 (file)
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -19,173 +19,6 @@
 
 #include "ste-dma40-db8500.h"
 
-static struct nmk_gpio_platform_data u8500_gpio_data[] = {
-       GPIO_DATA("GPIO-0-31", 0),
-       GPIO_DATA("GPIO-32-63", 32), /* 37..63 not routed to pin */
-       GPIO_DATA("GPIO-64-95", 64),
-       GPIO_DATA("GPIO-96-127", 96), /* 98..127 not routed to pin */
-       GPIO_DATA("GPIO-128-159", 128),
-       GPIO_DATA("GPIO-160-191", 160), /* 172..191 not routed to pin */
-       GPIO_DATA("GPIO-192-223", 192),
-       GPIO_DATA("GPIO-224-255", 224), /* 231..255 not routed to pin */
-       GPIO_DATA("GPIO-256-288", 256), /* 268..288 not routed to pin */
-};
-
-static struct resource u8500_gpio_resources[] = {
-       GPIO_RESOURCE(0),
-       GPIO_RESOURCE(1),
-       GPIO_RESOURCE(2),
-       GPIO_RESOURCE(3),
-       GPIO_RESOURCE(4),
-       GPIO_RESOURCE(5),
-       GPIO_RESOURCE(6),
-       GPIO_RESOURCE(7),
-       GPIO_RESOURCE(8),
-};
-
-struct platform_device u8500_gpio_devs[] = {
-       GPIO_DEVICE(0),
-       GPIO_DEVICE(1),
-       GPIO_DEVICE(2),
-       GPIO_DEVICE(3),
-       GPIO_DEVICE(4),
-       GPIO_DEVICE(5),
-       GPIO_DEVICE(6),
-       GPIO_DEVICE(7),
-       GPIO_DEVICE(8),
-};
-
-struct amba_device u8500_ssp0_device = {
-       .dev = {
-               .coherent_dma_mask = ~0,
-               .init_name = "ssp0",
-       },
-       .res = {
-               .start = U8500_SSP0_BASE,
-               .end   = U8500_SSP0_BASE + SZ_4K - 1,
-               .flags = IORESOURCE_MEM,
-       },
-       .irq = {IRQ_DB8500_SSP0, NO_IRQ },
-       /* ST-Ericsson modified id */
-       .periphid = SSP_PER_ID,
-};
-
-static struct resource u8500_i2c0_resources[] = {
-       [0] = {
-               .start  = U8500_I2C0_BASE,
-               .end    = U8500_I2C0_BASE + SZ_4K - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = IRQ_DB8500_I2C0,
-               .end    = IRQ_DB8500_I2C0,
-               .flags  = IORESOURCE_IRQ,
-       }
-};
-
-struct platform_device u8500_i2c0_device = {
-       .name           = "nmk-i2c",
-       .id             = 0,
-       .resource       = u8500_i2c0_resources,
-       .num_resources  = ARRAY_SIZE(u8500_i2c0_resources),
-};
-
-static struct resource u8500_i2c4_resources[] = {
-       [0] = {
-               .start  = U8500_I2C4_BASE,
-               .end    = U8500_I2C4_BASE + SZ_4K - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = IRQ_DB8500_I2C4,
-               .end    = IRQ_DB8500_I2C4,
-               .flags  = IORESOURCE_IRQ,
-       }
-};
-
-struct platform_device u8500_i2c4_device = {
-       .name           = "nmk-i2c",
-       .id             = 4,
-       .resource       = u8500_i2c4_resources,
-       .num_resources  = ARRAY_SIZE(u8500_i2c4_resources),
-};
-
-/*
- * SD/MMC
- */
-
-struct amba_device u8500_sdi0_device = {
-       .dev            = {
-               .init_name = "sdi0",
-       },
-       .res            = {
-               .start  = U8500_SDI0_BASE,
-               .end    = U8500_SDI0_BASE + SZ_4K - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       .irq            = {IRQ_DB8500_SDMMC0, NO_IRQ},
-};
-
-struct amba_device u8500_sdi1_device = {
-       .dev            = {
-               .init_name = "sdi1",
-       },
-       .res            = {
-               .start  = U8500_SDI1_BASE,
-               .end    = U8500_SDI1_BASE + SZ_4K - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       .irq            = {IRQ_DB8500_SDMMC1, NO_IRQ},
-};
-
-struct amba_device u8500_sdi2_device = {
-       .dev            = {
-               .init_name = "sdi2",
-       },
-       .res            = {
-               .start  = U8500_SDI2_BASE,
-               .end    = U8500_SDI2_BASE + SZ_4K - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       .irq            = {IRQ_DB8500_SDMMC2, NO_IRQ},
-};
-
-struct amba_device u8500_sdi3_device = {
-       .dev            = {
-               .init_name = "sdi3",
-       },
-       .res            = {
-               .start  = U8500_SDI3_BASE,
-               .end    = U8500_SDI3_BASE + SZ_4K - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       .irq            = {IRQ_DB8500_SDMMC3, NO_IRQ},
-};
-
-struct amba_device u8500_sdi4_device = {
-       .dev            = {
-               .init_name = "sdi4",
-       },
-       .res            = {
-               .start  = U8500_SDI4_BASE,
-               .end    = U8500_SDI4_BASE + SZ_4K - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       .irq            = {IRQ_DB8500_SDMMC4, NO_IRQ},
-};
-
-struct amba_device u8500_sdi5_device = {
-       .dev            = {
-               .init_name = "sdi5",
-       },
-       .res            = {
-               .start  = U8500_SDI5_BASE,
-               .end    = U8500_SDI5_BASE + SZ_4K - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       .irq            = {IRQ_DB8500_SDMMC5, NO_IRQ},
-};
-
 static struct resource dma40_resources[] = {
        [0] = {
                .start = U8500_DMA_BASE,
@@ -295,7 +128,7 @@ struct resource keypad_resources[] = {
        },
 };
 
-struct platform_device ux500_ske_keypad_device = {
+struct platform_device u8500_ske_keypad_device = {
        .name = "nmk-ske-keypad",
        .id = -1,
        .num_resources = ARRAY_SIZE(keypad_resources),