10 files changed, 207 insertions, 2 deletions

diff --git a/Documentation/devicetree/bindings/usb/platform-uhci.txt b/Documentation/devicetree/bindings/usb/platform-uhci.txt
new file mode 100644
index 000000000000..91477d6830ec
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/platform-uhci.txt
@@ -0,0 +1,12 @@
+Generic Platform UHCI controllers.
+
+Required properties:
+ - compatible: Should be "platform-uhci".
+ - reg: Address range of the uhci registers
+ - interrupts: Should contain the uhci interrupt.
+
+usb: uhci@D8007301 {
+        compatible = "platform-uhci", "usb-uhci";
+        reg = <0xD8007301 0x200>;
+        interrupts = <0>;
+};
diff --git a/arch/arm/mach-vt8500/bv07.c b/arch/arm/mach-vt8500/bv07.c
index f9fbeb2d10e9..6fd9d609ebaa 100644
--- a/arch/arm/mach-vt8500/bv07.c
+++ b/arch/arm/mach-vt8500/bv07.c
@@ -33,6 +33,7 @@ static struct platform_device *devices[] __initdata = {
         &vt8500_device_uart0,
         &vt8500_device_lcdc,
         &vt8500_device_ehci,
+        &vt8500_device_uhci,
         &vt8500_device_ge_rops,
         &vt8500_device_pwm,
         &vt8500_device_pwmbl,
diff --git a/arch/arm/mach-vt8500/devices-vt8500.c b/arch/arm/mach-vt8500/devices-vt8500.c
index 19519aeecf37..def7fe393a2c 100644
--- a/arch/arm/mach-vt8500/devices-vt8500.c
+++ b/arch/arm/mach-vt8500/devices-vt8500.c
@@ -48,6 +48,11 @@ void __init vt8500_set_resources(void)
         tmp[1] = wmt_irq_res(IRQ_EHCI);
         wmt_res_add(&vt8500_device_ehci, tmp, 2);
 
+        /* vt8500 uses a single IRQ for both EHCI and UHCI controllers */
+        tmp[0] = wmt_mmio_res(VT8500_UHCI_BASE, SZ_512);
+        tmp[1] = wmt_irq_res(IRQ_EHCI);
+        wmt_res_add(&vt8500_device_uhci, tmp, 2);
+
         tmp[0] = wmt_mmio_res(VT8500_GEGEA_BASE, SZ_256);
         wmt_res_add(&vt8500_device_ge_rops, tmp, 1);
 
diff --git a/arch/arm/mach-vt8500/devices-wm8505.c b/arch/arm/mach-vt8500/devices-wm8505.c
index db4594e029f4..c810454178dc 100644
--- a/arch/arm/mach-vt8500/devices-wm8505.c
+++ b/arch/arm/mach-vt8500/devices-wm8505.c
@@ -55,6 +55,10 @@ void __init wm8505_set_resources(void)
         tmp[1] = wmt_irq_res(IRQ_EHCI);
         wmt_res_add(&vt8500_device_ehci, tmp, 2);
 
+        tmp[0] = wmt_mmio_res(WM8505_UHCI_BASE, SZ_512);
+        tmp[1] = wmt_irq_res(IRQ_UHCI);
+        wmt_res_add(&vt8500_device_uhci, tmp, 2);
+
         tmp[0] = wmt_mmio_res(WM8505_GEGEA_BASE, SZ_256);
         wmt_res_add(&vt8500_device_ge_rops, tmp, 1);
 
diff --git a/arch/arm/mach-vt8500/devices.c b/arch/arm/mach-vt8500/devices.c
index 1fcdc36b358d..46ff82dad544 100644
--- a/arch/arm/mach-vt8500/devices.c
+++ b/arch/arm/mach-vt8500/devices.c
@@ -204,6 +204,17 @@ struct platform_device vt8500_device_ehci = {
         },
 };
 
+static u64 uhci_dma_mask = DMA_BIT_MASK(32);
+
+struct platform_device vt8500_device_uhci = {
+        .name           = "platform-uhci",
+        .id             = 0,
+        .dev            = {
+                .dma_mask       = &uhci_dma_mask,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
+        },
+};
+
 struct platform_device vt8500_device_ge_rops = {
         .name           = "wmt_ge_rops",
         .id             = -1,
diff --git a/arch/arm/mach-vt8500/devices.h b/arch/arm/mach-vt8500/devices.h
index 188d4e17f35c..0e6d9f904c77 100644
--- a/arch/arm/mach-vt8500/devices.h
+++ b/arch/arm/mach-vt8500/devices.h
@@ -81,6 +81,7 @@ extern struct platform_device vt8500_device_uart5;
 extern struct platform_device vt8500_device_lcdc;
 extern struct platform_device vt8500_device_wm8505_fb;
 extern struct platform_device vt8500_device_ehci;
+extern struct platform_device vt8500_device_uhci;
 extern struct platform_device vt8500_device_ge_rops;
 extern struct platform_device vt8500_device_pwm;
 extern struct platform_device vt8500_device_pwmbl;
diff --git a/arch/arm/mach-vt8500/wm8505_7in.c b/arch/arm/mach-vt8500/wm8505_7in.c
index db19886caf7c..4804e2a45574 100644
--- a/arch/arm/mach-vt8500/wm8505_7in.c
+++ b/arch/arm/mach-vt8500/wm8505_7in.c
@@ -32,6 +32,7 @@ static void __iomem *pmc_hiber;
 static struct platform_device *devices[] __initdata = {
         &vt8500_device_uart0,
         &vt8500_device_ehci,
+        &vt8500_device_uhci,
         &vt8500_device_wm8505_fb,
         &vt8500_device_ge_rops,
         &vt8500_device_pwm,
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 075d2eca8108..c3f619b1f598 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -450,7 +450,7 @@ config USB_OHCI_LITTLE_ENDIAN
 
 config USB_UHCI_HCD
         tristate "UHCI HCD (most Intel and VIA) support"
-        depends on USB && (PCI || SPARC_LEON)
+        depends on USB && (PCI || SPARC_LEON || ARCH_VT8500)
         ---help---
           The Universal Host Controller Interface is a standard by Intel for
           accessing the USB hardware in the PC (which is also called the USB
@@ -468,7 +468,15 @@ config USB_UHCI_HCD
 config USB_UHCI_SUPPORT_NON_PCI_HC
         bool
         depends on USB_UHCI_HCD
-        default y if SPARC_LEON
+        default y if (SPARC_LEON || ARCH_VT8500)
+
+config USB_UHCI_PLATFORM
+        bool "Generic UHCI Platform Driver support"
+        depends on USB_UHCI_SUPPORT_NON_PCI_HC
+        default y if ARCH_VT8500
+        ---help---
+          Enable support for generic UHCI platform devices that require no
+          additional configuration.
 
 config USB_UHCI_BIG_ENDIAN_MMIO
         bool
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index e4db350602b8..4b9e9aba2665 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -846,6 +846,11 @@ static const char hcd_name[] = "uhci_hcd";
 #define PLATFORM_DRIVER         uhci_grlib_driver
 #endif
 
+#ifdef CONFIG_USB_UHCI_PLATFORM
+#include "uhci-platform.c"
+#define PLATFORM_DRIVER         uhci_platform_driver
+#endif
+
 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER)
 #error "missing bus glue for uhci-hcd"
 #endif
diff --git a/drivers/usb/host/uhci-platform.c b/drivers/usb/host/uhci-platform.c
new file mode 100644
index 000000000000..e4780491df4a
--- /dev/null
+++ b/drivers/usb/host/uhci-platform.c
@@ -0,0 +1,157 @@
+/*
+ * Generic UHCI HCD (Host Controller Driver) for Platform Devices
+ *
+ * Copyright (c) 2011 Tony Prisk <linux@prisktech.co.nz>
+ *
+ * This file is based on uhci-grlib.c
+ * (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu
+ */
+
+#include <linux/of.h>
+#include <linux/platform_device.h>
+
+static int uhci_platform_init(struct usb_hcd *hcd)
+{
+        struct uhci_hcd *uhci = hcd_to_uhci(hcd);
+
+        uhci->rh_numports = uhci_count_ports(hcd);
+
+        /* Set up pointers to to generic functions */
+        uhci->reset_hc = uhci_generic_reset_hc;
+        uhci->check_and_reset_hc = uhci_generic_check_and_reset_hc;
+
+        /* No special actions need to be taken for the functions below */
+        uhci->con