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.c

diff --git a/arch/arm/mach-ux500/devices.c b/arch/arm/mach-ux500/devices.c
index 8a268893cb7fb8315c51732cce455b6a5fe6d4c9..ea0a2f92ca70875ff0716722f35fbd3dc45a91dd 100644 (file)
--- a/arch/arm/mach-ux500/devices.c
+++ b/arch/arm/mach-ux500/devices.c
@@ -14,69 +14,6 @@
 #include <mach/hardware.h>
 #include <mach/setup.h>
 
-#define __MEM_4K_RESOURCE(x) \
-       .res = {.start = (x), .end = (x) + SZ_4K - 1, .flags = IORESOURCE_MEM}
-
-struct amba_device ux500_pl031_device = {
-       .dev = {
-               .init_name = "pl031",
-       },
-       .res = {
-               .start  = UX500_RTC_BASE,
-               .end    = UX500_RTC_BASE + SZ_4K - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       .irq = {IRQ_RTC_RTT, NO_IRQ},
-};
-
-struct amba_device ux500_uart0_device = {
-       .dev = { .init_name = "uart0" },
-       __MEM_4K_RESOURCE(UX500_UART0_BASE),
-       .irq = {IRQ_UART0, NO_IRQ},
-};
-
-struct amba_device ux500_uart1_device = {
-       .dev = { .init_name = "uart1" },
-       __MEM_4K_RESOURCE(UX500_UART1_BASE),
-       .irq = {IRQ_UART1, NO_IRQ},
-};
-
-struct amba_device ux500_uart2_device = {
-       .dev = { .init_name = "uart2" },
-       __MEM_4K_RESOURCE(UX500_UART2_BASE),
-       .irq = {IRQ_UART2, NO_IRQ},
-};
-
-#define UX500_I2C_RESOURCES(id, size)                          \
-static struct resource ux500_i2c##id##_resources[] = {         \
-       [0] = {                                                 \
-               .start  = UX500_I2C##id##_BASE,                 \
-               .end    = UX500_I2C##id##_BASE + size - 1,      \
-               .flags  = IORESOURCE_MEM,                       \
-       },                                                      \
-       [1] = {                                                 \
-               .start  = IRQ_I2C##id,                          \
-               .end    = IRQ_I2C##id,                          \
-               .flags  = IORESOURCE_IRQ                        \
-       }                                                       \
-}
-
-UX500_I2C_RESOURCES(1, SZ_4K);
-UX500_I2C_RESOURCES(2, SZ_4K);
-UX500_I2C_RESOURCES(3, SZ_4K);
-
-#define UX500_I2C_PDEVICE(cid)                                 \
-struct platform_device ux500_i2c##cid##_device = {             \
-       .name           = "nmk-i2c",                            \
-       .id             = cid,                                  \
-       .num_resources  = 2,                                    \
-       .resource       = ux500_i2c##cid##_resources,           \
-}
-
-UX500_I2C_PDEVICE(1);
-UX500_I2C_PDEVICE(2);
-UX500_I2C_PDEVICE(3);
-
 void __init amba_add_devices(struct amba_device *devs[], int num)
 {
        int i;