1 files changed, 47 insertions, 4 deletions

diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index fbe288a8da65..2ec9a9e9a04d 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -28,6 +28,7 @@
 #include <linux/timex.h>
 #include <linux/clocksource.h>
 
+#include <asm/arch/udc.h>
 #include <asm/hardware.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -39,6 +40,8 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 
+static int __init ixp4xx_clocksource_init(void);
+
 /*************************************************************************
  * IXP4xx chipset I/O mapping
  *************************************************************************/
@@ -195,7 +198,7 @@ static void ixp4xx_irq_unmask(unsigned int irq)
                 *IXP4XX_ICMR |= (1 << irq);
 }
 
-static struct irqchip ixp4xx_irq_chip = {
+static struct irq_chip ixp4xx_irq_chip = {
         .name           = "IXP4xx",
         .ack            = ixp4xx_irq_ack,
         .mask           = ixp4xx_irq_mask,
@@ -224,7 +227,7 @@ void __init ixp4xx_init_irq(void)
         /* Default to all level triggered */
         for(i = 0; i < NR_IRQS; i++) {
                 set_irq_chip(i, &ixp4xx_irq_chip);
-                set_irq_handler(i, do_level_IRQ);
+                set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID);
         }
 }
@@ -280,12 +283,52 @@ static void __init ixp4xx_timer_init(void)
 
         /* Connect the interrupt handler and enable the interrupt */
         setup_irq(IRQ_IXP4XX_TIMER1, &ixp4xx_timer_irq);
+
+        ixp4xx_clocksource_init();
 }
 
 struct sys_timer ixp4xx_timer = {
         .init           = ixp4xx_timer_init,
 };
 
+static struct pxa2xx_udc_mach_info ixp4xx_udc_info;
+
+void __init ixp4xx_set_udc_info(struct pxa2xx_udc_mach_info *info)
+{
+        memcpy(&ixp4xx_udc_info, info, sizeof *info);
+}
+
+static struct resource ixp4xx_udc_resources[] = {
+        [0] = {
+                .start  = 0xc800b000,
+                .end    = 0xc800bfff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_IXP4XX_USB,
+                .end    = IRQ_IXP4XX_USB,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+/*
+ * USB device controller. The IXP4xx uses the same controller as PXA2XX,
+ * so we just use the same device.
+ */
+static struct platform_device ixp4xx_udc_device = {
+        .name           = "pxa2xx-udc",
+        .id             = -1,
+        .num_resources  = 2,
+        .resource       = ixp4xx_udc_resources,
+        .dev            = {
+                .platform_data = &ixp4xx_udc_info,
+        },
+};
+
+static struct platform_device *ixp4xx_devices[] __initdata = {
+        &ixp4xx_udc_device,
+};
+
 static struct resource ixp46x_i2c_resources[] = {
         [0] = {
                 .start  = 0xc8011000,
@@ -321,6 +364,8 @@ void __init ixp4xx_sys_init(void)
 {
         ixp4xx_exp_bus_size = SZ_16M;
 
+        platform_add_devices(ixp4xx_devices, ARRAY_SIZE(ixp4xx_devices));
+
         if (cpu_is_ixp46x()) {
                 int region;
 
@@ -363,5 +408,3 @@ static int __init ixp4xx_clocksource_init(void)
 
         return 0;
 }
-
-device_initcall(ixp4xx_clocksource_init);