Merge tag 'v3.15-rc1' into perf/urgent

Pick up the latest fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 31 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
index 70b3323caf1a..dd84a9e313b3 100644
--- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
+++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
@@ -13,16 +13,47 @@
 
 /dts-v1/;
 /include/ "sun4i-a10.dtsi"
+/include/ "sunxi-common-regulators.dtsi"
 
 / {
         model = "PineRiver Mini X-Plus";
         compatible = "pineriver,mini-xplus", "allwinner,sun4i-a10";
 
         soc@01c00000 {
+                usbphy: phy@01c13400 {
+                        usb1_vbus-supply = <&reg_usb1_vbus>;
+                        usb2_vbus-supply = <&reg_usb2_vbus>;
+                        status = "okay";
+                };
+
+                ehci0: usb@01c14000 {
+                        status = "okay";
+                };
+
+                ohci0: usb@01c14400 {
+                        status = "okay";
+                };
+
+                ehci1: usb@01c1c000 {
+                        status = "okay";
+                };
+
+                ohci1: usb@01c1c400 {
+                        status = "okay";
+                };
+
                 uart0: serial@01c28000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&uart0_pins_a>;
                         status = "okay";
                 };
         };
+
+        reg_usb1_vbus: usb1-vbus {
+                status = "okay";
+        };
+
+        reg_usb2_vbus: usb2-vbus {
+                status = "okay";
+        };
 };