10 files changed, 110 insertions, 40 deletions

diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index ad911854eb4c..b6ec10627776 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -35,6 +35,7 @@ config MACH_REALVIEW_PB11MP
         bool "Support RealView/PB11MPCore platform"
         select CPU_V6
         select ARM_GIC
+        select HAVE_PATA_PLATFORM
         help
           Include support for the ARM(R) RealView MPCore Platform Baseboard.
           PB11MPCore is a platform with an on-board ARM11MPCore and has
@@ -51,6 +52,7 @@ config MACH_REALVIEW_PBA8
         bool "Support RealView/PB-A8 platform"
         select CPU_V7
         select ARM_GIC
+        select HAVE_PATA_PLATFORM
         help
           Include support for the ARM(R) RealView Cortex-A8 Platform Baseboard.
           PB-A8 is a platform with an on-board Cortex-A8 and has support for
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index bd2aa4f16141..d6766685cfc7 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -29,6 +29,7 @@
 #include <linux/clockchips.h>
 #include <linux/io.h>
 #include <linux/smc911x.h>
+#include <linux/ata_platform.h>
 
 #include <asm/clkdev.h>
 #include <asm/system.h>
@@ -150,6 +151,44 @@ int realview_eth_register(const char *name, struct resource *res)
         return platform_device_register(&realview_eth_device);
 }
 
+struct platform_device realview_usb_device = {
+        .name                   = "isp1760",
+        .num_resources          = 2,
+};
+
+int realview_usb_register(struct resource *res)
+{
+        realview_usb_device.resource = res;
+        return platform_device_register(&realview_usb_device);
+}
+
+static struct pata_platform_info pata_platform_data = {
+        .ioport_shift           = 1,
+};
+
+static struct resource pata_resources[] = {
+        [0] = {
+                .start          = REALVIEW_CF_BASE,
+                .end            = REALVIEW_CF_BASE + 0xff,
+                .flags          = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start          = REALVIEW_CF_BASE + 0x100,
+                .end            = REALVIEW_CF_BASE + SZ_4K - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+};
+
+struct platform_device realview_cf_device = {
+        .name                   = "pata_platform",
+        .id                     = -1,
+        .num_resources          = ARRAY_SIZE(pata_resources),
+        .resource               = pata_resources,
+        .dev                    = {
+                .platform_data  = &pata_platform_data,
+        },
+};
+
 static struct resource realview_i2c_resource = {
         .start          = REALVIEW_I2C_BASE,
         .end            = REALVIEW_I2C_BASE + SZ_4K - 1,
@@ -158,11 +197,25 @@ static struct resource realview_i2c_resource = {
 
 struct platform_device realview_i2c_device = {
         .name           = "versatile-i2c",
-        .id             = -1,
+        .id             = 0,
         .num_resources  = 1,
         .resource       = &realview_i2c_resource,
 };
 
+static struct i2c_board_info realview_i2c_board_info[] = {
+        {
+                I2C_BOARD_INFO("rtc-ds1307", 0xd0 >> 1),
+                .type = "ds1338",
+        },
+};
+
+static int __init realview_i2c_init(void)
+{
+        return i2c_register_board_info(0, realview_i2c_board_info,
+                                       ARRAY_SIZE(realview_i2c_board_info));
+}
+arch_initcall(realview_i2c_init);
+
 #define REALVIEW_SYSMCI (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_MCI_OFFSET)
 
 static unsigned int realview_mmc_status(struct device *dev)
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h
index 44269b162d49..21c08637683b 100644
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@ -45,6 +45,7 @@ static struct amba_device name##_device = {			\
 }
 
 extern struct platform_device realview_flash_device;
+extern struct platform_device realview_cf_device;
 extern struct platform_device realview_i2c_device;
 extern struct mmc_platform_data realview_mmc0_plat_data;
 extern struct mmc_platform_data realview_mmc1_plat_data;
@@ -62,5 +63,6 @@ extern void realview_leds_event(led_event_t ledevt);
 extern void realview_timer_init(unsigned int timer_irq);
 extern int realview_flash_register(struct resource *res, u32 num);
 extern int realview_eth_register(const char *name, struct resource *res);
+extern int realview_usb_register(struct resource *res);
 
 #endif
diff --git a/arch/arm/mach-realview/include/mach/board-pba8.h b/arch/arm/mach-realview/include/mach/board-pba8.h
index c8bed8f58bab..307f97b16e5b 100644
--- a/arch/arm/mach-realview/include/mach/board-pba8.h
+++ b/arch/arm/mach-realview/include/mach/board-pba8.h
@@ -45,8 +45,6 @@
 #define REALVIEW_PBA8_DMC_BASE                  0x100E0000      /* DMC configuration */
 #define REALVIEW_PBA8_SMC_BASE                  0x100E1000      /* SMC configuration */
 #define REALVIEW_PBA8_CAN_BASE                  0x100E2000      /* CAN bus */
-#define REALVIEW_PBA8_CF_BASE                   0x18000000      /* Compact flash */
-#define REALVIEW_PBA8_CF_MEM_BASE               0x18003000      /* SMC for Compact flash */
 #define REALVIEW_PBA8_GIC_CPU_BASE              0x1E000000      /* Generic interrupt controller CPU interface */
 #define REALVIEW_PBA8_FLASH0_BASE               0x40000000
 #define REALVIEW_PBA8_FLASH0_SIZE               SZ_64M
diff --git a/arch/arm/mach-realview/include/mach/platform.h b/arch/arm/mach-realview/include/mach/platform.h
index 793a3a332712..c8f50835fed2 100644
--- a/arch/arm/mach-realview/include/mach/platform.h
+++ b/arch/arm/mach-realview/include/mach/platform.h
@@ -204,6 +204,12 @@
 #define REALVIEW_LT_BASE              0x80000000        /* Logic Tile expansion */
 
 /*
+ * CompactFlash
+ */
+#define REALVIEW_CF_BASE                0x18000000      /* CompactFlash */
+#define REALVIEW_CF_MEM_BASE            0x18003000      /* SMC for CompactFlash */
+
+/*
  * Disk on Chip
  */
 #define REALVIEW_DOC_BASE             0x2C000000
diff --git a/arch/arm/mach-realview/include/mach/system.h b/arch/arm/mach-realview/include/mach/system.h
index a2f61c78adbf..1a15a441e027 100644
--- a/arch/arm/mach-realview/include/mach/system.h
+++ b/arch/arm/mach-realview/include/mach/system.h
@@ -34,7 +34,7 @@ static inline void arch_idle(void)
         cpu_do_idle();
 }
 
-static inline void arch_reset(char mode)
+static inline void arch_reset(char mode, const char *cmd)
 {
         void __iomem *hdr_ctrl = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_RESETCTL_OFFSET;
         unsigned int val;
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index bed39ed97613..c20fbef122b3 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -264,6 +264,19 @@ static int eth_device_register(void)
         return realview_eth_register(name, realview_eb_eth_resources);
 }
 
+static struct resource realview_eb_isp1761_resources[] = {
+        [0] = {
+                .start          = REALVIEW_EB_USB_BASE,
+                .end            = REALVIEW_EB_USB_BASE + SZ_128K - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start          = IRQ_EB_USB,
+                .end            = IRQ_EB_USB,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
 static void __init gic_init_irq(void)
 {
         if (core_tile_eb11mp() || core_tile_a9mp()) {
@@ -323,6 +336,8 @@ static void realview_eb11mp_fixup(void)
         /* platform devices */
         realview_eb_eth_resources[1].start      = IRQ_EB11MP_ETH;
         realview_eb_eth_resources[1].end        = IRQ_EB11MP_ETH;
+        realview_eb_isp1761_resources[1].start  = IRQ_EB11MP_USB;
+        realview_eb_isp1761_resources[1].end    = IRQ_EB11MP_USB;
 }
 
 static void __init realview_eb_timer_init(void)
@@ -366,6 +381,7 @@ static void __init realview_eb_init(void)
         realview_flash_register(&realview_eb_flash_resource, 1);
         platform_device_register(&realview_i2c_device);
         eth_device_register();
+        realview_usb_register(realview_eb_isp1761_resources);
 
         for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
                 struct amba_device *d = amba_devs[i];
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index 8f0683c22140..a64b84a7a3df 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -222,6 +222,19 @@ static struct resource realview_pb1176_smsc911x_resources[] = {
         },
 };
 
+static struct resource realview_pb1176_isp1761_resources[] = {
+        [0] = {
+                .start          = REALVIEW_PB1176_USB_BASE,
+                .end            = REALVIEW_PB1176_USB_BASE + SZ_128K - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start          = IRQ_PB1176_USB,
+                .end            = IRQ_PB1176_USB,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
 static void __init gic_init_irq(void)
 {
         /* ARM1176 DevChip GIC, primary */
@@ -260,6 +273,8 @@ static void __init realview_pb1176_init(void)
 
         realview_flash_register(&realview_pb1176_flash_resource, 1);
         realview_eth_register(NULL, realview_pb1176_smsc911x_resources);
+        platform_device_register(&realview_i2c_device);
+        realview_usb_register(realview_pb1176_isp1761_resources);
 
         for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
                 struct amba_device *d = amba_devs[i];
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index 3ebdb2dadd6f..ea1e60eca359 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -230,31 +230,19 @@ static struct resource realview_pb11mp_smsc911x_resources[] = {
         },
 };
 
-struct resource realview_pb11mp_cf_resources[] = {
+static struct resource realview_pb11mp_isp1761_resources[] = {
         [0] = {
-                .start          = REALVIEW_PB11MP_CF_BASE,
-                .end            = REALVIEW_PB11MP_CF_BASE + SZ_4K - 1,
+                .start          = REALVIEW_PB11MP_USB_BASE,
+                .end            = REALVIEW_PB11MP_USB_BASE + SZ_128K - 1,
                 .flags          = IORESOURCE_MEM,
         },
         [1] = {
-                .start          = REALVIEW_PB11MP_CF_MEM_BASE,
-                .end            = REALVIEW_PB11MP_CF_MEM_BASE + SZ_4K - 1,
-                .flags          = IORESOURCE_MEM,
-        },
-        [2] = {
-                .start          = -1,           /* FIXME: Find correct irq */
-                .end            = -1,
+                .start          = IRQ_TC11MP_USB,
+                .end            = IRQ_TC11MP_USB,
                 .flags          = IORESOURCE_IRQ,
         },
 };
 
-struct platform_device realview_pb11mp_cf_device = {
-        .name           = "compactflash",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(realview_pb11mp_cf_resources),
-        .resource       = realview_pb11mp_cf_resources,
-};
-
 static void __init gic_init_irq(void)
 {
         unsigned int pldctrl;
@@ -308,7 +296,8 @@ static void __init realview_pb11mp_init(void)
                                 ARRAY_SIZE(realview_pb11mp_flash_resource));
         realview_eth_register(NULL, realview_pb11mp_smsc911x_resources);
         platform_device_register(&realview_i2c_device);
-        platform_device_register(&realview_pb11mp_cf_device);
+        platform_device_register(&realview_cf_device);
+        realview_usb_register(realview_pb11mp_isp1761_resources);
 
         for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
                 struct amba_device *d = amba_devs[i];
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index 34c94435d2d8..d6ac1eb86576 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -221,31 +221,19 @@ static struct resource realview_pba8_smsc911x_resources[] = {
         },
 };
 
-struct resource realview_pba8_cf_resources[] = {
+static struct resource realview_pba8_isp1761_resources[] = {
         [0] = {
-                .start          = REALVIEW_PBA8_CF_BASE,
-                .end            = REALVIEW_PBA8_CF_BASE + SZ_4K - 1,
+                .start          = REALVIEW_PBA8_USB_BASE,
+                .end            = REALVIEW_PBA8_USB_BASE + SZ_128K - 1,
                 .flags          = IORESOURCE_MEM,
         },
         [1] = {
-                .start          = REALVIEW_PBA8_CF_MEM_BASE,
-                .end            = REALVIEW_PBA8_CF_MEM_BASE + SZ_4K - 1,
-                .flags          = IORESOURCE_MEM,
-        },
-        [2] = {
-                .start          = -1,           /* FIXME: Find correct irq */
-                .end            = -1,
+                .start          = IRQ_PBA8_USB,
+                .end            = IRQ_PBA8_USB,
                 .flags          = IORESOURCE_IRQ,
         },
 };
 
-struct platform_device realview_pba8_cf_device = {
-        .name           = "compactflash",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(realview_pba8_cf_resources),
-        .resource       = realview_pba8_cf_resources,
-};
-
 static void __init gic_init_irq(void)
 {
         /* ARM PB-A8 on-board GIC */
@@ -276,7 +264,8 @@ static void __init realview_pba8_init(void)
                                 ARRAY_SIZE(realview_pba8_flash_resource));
         realview_eth_register(NULL, realview_pba8_smsc911x_resources);
         platform_device_register(&realview_i2c_device);
-        platform_device_register(&realview_pba8_cf_device);
+        platform_device_register(&realview_cf_device);
+        realview_usb_register(realview_pba8_isp1761_resources);
 
         for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
                 struct amba_device *d = amba_devs[i];