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

[linux.git] / arch / arm / boot / dts / sun7i-a20-olinuxino-micro.dts

diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index ead3013f9aca9db6a3a5e73b0539ba3698139784..eeadf76362fa4238875bc83f6b0853edbba9c5c6 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -13,25 +13,55 @@
 
 /dts-v1/;
 /include/ "sun7i-a20.dtsi"
+/include/ "sunxi-common-regulators.dtsi"
 
 / {
        model = "Olimex A20-Olinuxino Micro";
        compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20";
 
+       aliases {
+               spi0 = &spi1;
+               spi1 = &spi2;
+       };
+
        soc@01c00000 {
-               emac: ethernet@01c0b000 {
+               spi1: spi@01c06000 {
                        pinctrl-names = "default";
-                       pinctrl-0 = <&emac_pins_a>;
-                       phy = <&phy1>;
+                       pinctrl-0 = <&spi1_pins_a>;
                        status = "okay";
                };
 
-               mdio@01c0b080 {
+               usbphy: phy@01c13400 {
+                       usb1_vbus-supply = <&reg_usb1_vbus>;
+                       usb2_vbus-supply = <&reg_usb2_vbus>;
                        status = "okay";
+               };
 
-                       phy1: ethernet-phy@1 {
-                               reg = <1>;
-                       };
+               ehci0: usb@01c14000 {
+                       status = "okay";
+               };
+
+               ohci0: usb@01c14400 {
+                       status = "okay";
+               };
+
+               spi2: spi@01c17000 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&spi2_pins_a>;
+                       status = "okay";
+               };
+
+               ahci: sata@01c18000 {
+                       target-supply = <&reg_ahci_5v>;
+                       status = "okay";
+               };
+
+               ehci1: usb@01c1c000 {
+                       status = "okay";
+               };
+
+               ohci1: usb@01c1c400 {
+                       status = "okay";
                };
 
                pinctrl@01c20800 {
@@ -78,6 +108,18 @@
                        pinctrl-0 = <&i2c2_pins_a>;
                        status = "okay";
                };
+
+               gmac: ethernet@01c50000 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&gmac_pins_mii_a>;
+                       phy = <&phy1>;
+                       phy-mode = "mii";
+                       status = "okay";
+
+                       phy1: ethernet-phy@1 {
+                               reg = <1>;
+                       };
+               };
        };
 
        leds {
@@ -91,4 +133,16 @@
                        default-state = "on";
                };
        };
+
+       reg_ahci_5v: ahci-5v {
+               status = "okay";
+       };
+
+       reg_usb1_vbus: usb1-vbus {
+               status = "okay";
+       };
+
+       reg_usb2_vbus: usb2-vbus {
+               status = "okay";
+       };
 };