Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / armada-385-db-ap.dts

diff --git a/arch/arm/boot/dts/armada-385-db-ap.dts b/arch/arm/boot/dts/armada-385-db-ap.dts
index 57b9119fb3e05e974ee8931286d2635ab57110fe..7219ac3a3d900743114fd7d9001748118695515e 100644 (file)
--- a/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts
@@ -49,8 +49,7 @@
        compatible = "marvell,a385-db-ap", "marvell,armada385", "marvell,armada38x";
 
        chosen {
-               bootargs = "console=ttyS0,115200";
-               stdout-path = &uart1;
+               stdout-path = "serial1:115200n8";
        };
 
        memory {
@@ -126,6 +125,13 @@
                                status = "okay";
                        };
 
+                       pinctrl@18000 {
+                               xhci0_vbus_pins: xhci0-vbus-pins {
+                                       marvell,pins = "mpp44";
+                                       marvell,function = "gpio";
+                               };
+                       };
+
                        ethernet@30000 {
                                status = "okay";
                                phy = <&phy2>;
@@ -150,6 +156,24 @@
                                phy = <&phy0>;
                                phy-mode = "rgmii-id";
                        };
+
+                       nfc: flash@d0000 {
+                               status = "okay";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               num-cs = <1>;
+                               nand-ecc-strength = <4>;
+                               nand-ecc-step-size = <512>;
+                               marvell,nand-keep-config;
+                               marvell,nand-enable-arbiter;
+                               nand-on-flash-bbt;
+                       };
+
+                       usb3@f0000 {
+                               status = "okay";
+                               usb-phy = <&usb3_phy>;
+                       };
                };
 
                pcie-controller {
@@ -175,4 +199,20 @@
                        };
                };
        };
+
+       usb3_phy: usb3_phy {
+               compatible = "usb-nop-xceiv";
+               vcc-supply = <&reg_xhci0_vbus>;
+       };
+
+       reg_xhci0_vbus: xhci0-vbus {
+               compatible = "regulator-fixed";
+               pinctrl-names = "default";
+               pinctrl-0 = <&xhci0_vbus_pins>;
+               regulator-name = "xhci0-vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+       };
 };