Merge tag 'v3.17-rockchip-rk3288-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Merge "Basic rk3288 usb support" from Heiko Stübner:

Add support for rk3288 ehci controllers.

* tag 'v3.17-rockchip-rk3288-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: Enable USB host0 (EHCI) on rk3288-evb
  ARM: dts: add rk3288 ehci usb devices
  ARM: dts: Turn on USB host vbus on rk3288-evb

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 42 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 749e20db3b37..4f572093c8b4 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -35,6 +35,18 @@
                         debounce-interval = <100>;
                 };
         };
+
+        /* This turns on USB vbus for both host0 (ehci) and host1 (dwc2) */
+        vcc_host: vcc-host-regulator {
+                compatible = "regulator-fixed";
+                enable-active-high;
+                gpio = <&gpio0 14 GPIO_ACTIVE_HIGH>;
+                pinctrl-names = "default";
+                pinctrl-0 = <&host_vbus_drv>;
+                regulator-name = "vcc_host";
+                regulator-always-on;
+                regulator-boot-on;
+        };
 };
 
 &i2c0 {
@@ -71,4 +83,14 @@
                         rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
                 };
         };
+
+        usb {
+                host_vbus_drv: host-vbus-drv {
+                        rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
+                };
+        };
+};
+
+&usb_host0_ehci {
+        status = "okay";
 };
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 3ef89512c942..e7cb00873dd4 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -251,6 +251,26 @@
                 status = "disabled";
         };
 
+        usb_host0_ehci: usb@ff500000 {
+                compatible = "generic-ehci";
+                reg = <0xff500000 0x100>;
+                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cru HCLK_USBHOST0>;
+                clock-names = "usbhost";
+                status = "disabled";
+        };
+
+        /* NOTE: ohci@ff520000 doesn't actually work on hardware */
+
+        usb_hsic: usb@ff5c0000 {
+                compatible = "generic-ehci";
+                reg = <0xff5c0000 0x100>;
+                interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&cru HCLK_HSIC>;
+                clock-names = "usbhost";
+                status = "disabled";
+        };
+
         gic: interrupt-controller@ffc01000 {
                 compatible = "arm,gic-400";
                 interrupt-controller;