1 files changed, 7 insertions, 18 deletions

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];