Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / arch / arm / boot / dts / sun5i-a10s-olinuxino-micro.dts

diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index 3c9f8b3cd3e3cf44e0d0bdd13be5444e437a2fea..23611b71d3aa65736b0419abaafe0a93491e2907 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -13,6 +13,7 @@
 
 /dts-v1/;
 /include/ "sun5i-a10s.dtsi"
+/include/ "sunxi-common-regulators.dtsi"
 
 / {
        model = "Olimex A10s-Olinuxino Micro";
@@ -34,6 +35,19 @@
                        };
                };
 
+               usbphy: phy@01c13400 {
+                       usb1_vbus-supply = <&reg_usb1_vbus>;
+                       status = "okay";
+               };
+
+               ehci0: usb@01c14000 {
+                       status = "okay";
+               };
+
+               ohci0: usb@01c14400 {
+                       status = "okay";
+               };
+
                pinctrl@01c20800 {
                        led_pins_olinuxino: led_pins@0 {
                                allwinner,pins = "PE3";
@@ -41,6 +55,13 @@
                                allwinner,drive = <1>;
                                allwinner,pull = <0>;
                        };
+
+                       usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 {
+                               allwinner,pins = "PB10";
+                               allwinner,function = "gpio_out";
+                               allwinner,drive = <0>;
+                               allwinner,pull = <0>;
+                       };
                };
 
                uart0: serial@01c28000 {
@@ -98,4 +119,10 @@
                        default-state = "on";
                };
        };
+
+       reg_usb1_vbus: usb1-vbus {
+               pinctrl-0 = <&usb1_vbus_pin_olinuxino_m>;
+               gpio = <&pio 1 10 0>;
+               status = "okay";
+       };
 };