Merge branch 'master' of git://git.denx.de/u-boot-uniphier

[u-boot] / arch / arm / dts / armada-37xx.dtsi

diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi
index bb14f543b5aac37f6a2399e12d274dc6499e8f86..5bea63b9837a2e1ac8eedeeb17f0adb52e1bf70c 100644 (file)
--- a/arch/arm/dts/armada-37xx.dtsi
+++ b/arch/arm/dts/armada-37xx.dtsi
@@ -45,6 +45,7 @@
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/comphy/comphy_data.h>
 
 / {
        model = "Marvell Armada 37xx SoC";
@@ -113,6 +114,12 @@
                                status = "disabled";
                        };
 
+                       usb2: usb@5e000 {
+                               compatible = "marvell,armada3700-ehci";
+                               reg = <0x5e000 0x450>;
+                               status = "disabled";
+                       };
+
                        xor@60900 {
                                compatible = "marvell,armada-3700-xor";
                                reg = <0x60900 0x100
@@ -126,6 +133,22 @@
                                };
                        };
 
+                       sdhci0: sdhci@d0000 {
+                               compatible = "marvell,armada-3700-sdhci",
+                               "marvell,sdhci-xenon";
+                               reg = <0xd0000 0x300
+                                      0x1e808 0x4>;
+                               status = "disabled";
+                       };
+
+                       sdhci1: sdhci@d8000 {
+                               compatible = "marvell,armada-3700-sdhci",
+                               "marvell,sdhci-xenon";
+                               reg = <0xd8000 0x300
+                                      0x17808 0x4>;
+                               status = "disabled";
+                       };
+
                        sata: sata@e0000 {
                                compatible = "marvell,armada-3700-ahci";
                                reg = <0xe0000 0x2000>;
@@ -141,6 +164,24 @@
                                      <0x1d40000 0x40000>; /* GICR */
                        };
 
+                       eth0: neta@30000 {
+                               compatible = "marvell,armada-3700-neta";
+                               reg = <0x30000 0x20>;
+                               status = "disabled";
+                       };
+
+                       eth1: neta@40000 {
+                               compatible = "marvell,armada-3700-neta";
+                               reg = <0x40000 0x20>;
+                               status = "disabled";
+                       };
+
+                       i2c0: i2c@11000 {
+                               compatible = "marvell,armada-3700-i2c";
+                               reg = <0x11000 0x100>;
+                               status = "disabled";
+                       };
+
                        spi0: spi@10600 {
                                compatible = "marvell,armada-3700-spi";
                                reg = <0x10600 0x50>;
@@ -151,6 +192,28 @@
                                spi-max-frequency = <40000>;
                                status = "disabled";
                        };
+
+                       pinctl0: pinctl@13830 { /* north bridge */
+                               compatible = "marvell,armada-3700-pinctl";
+                               bank-name = "armada-3700-nb";
+                               reg = <0x13830 0x4>;
+                               pin-count = <36>;
+                       };
+
+                       pinctl1: pinctl@18830 { /* south bridge */
+                               compatible = "marvell,armada-3700-pinctl";
+                               bank-name = "armada-3700-sb";
+                               reg = <0x18830 0x4>;
+                               pin-count = <30>;
+                       };
+
+                       comphy: comphy@18300 {
+                               compatible = "marvell,mvebu-comphy", "marvell,comphy-armada-3700";
+                               reg = <0x18300 0x28>,
+                                     <0x1f300 0x3d000>;
+                               mux-bitcount = <1>;
+                               max-lanes = <2>;
+                       };
                };
        };
 };