Merge git://git.denx.de/u-boot-x86

[oweals/u-boot.git] / arch / arm / dts / armada-7040-db.dts

diff --git a/arch/arm/dts/armada-7040-db.dts b/arch/arm/dts/armada-7040-db.dts
index 1e4d676f6773cc840d967b4730674539b31159a0..cfd2b4baf34d8b91cb4a9a74b1d676a5f4a85496 100644 (file)
--- a/arch/arm/dts/armada-7040-db.dts
+++ b/arch/arm/dts/armada-7040-db.dts
@@ -42,6 +42,7 @@
 
 /*
  * Device Tree file for Marvell Armada 7040 Development board platform
+ * Boot device: SPI NOR, 0x32 (SW3)
  */
 
 #include "armada-7040.dtsi"
@@ -66,6 +67,16 @@
        };
 };
 
+&ap_pinctl {
+          /* MPP Bus:
+           * SDIO  [0-5]
+           * UART0 [11,19]
+           */
+                 /* 0 1 2 3 4 5 6 7 8 9 */
+       pin-func = < 1 1 1 1 1 1 0 0 0 0
+                    0 3 0 0 0 0 0 0 0 3 >;
+};
+
 &uart0 {
        status = "okay";
 };
@@ -76,11 +87,37 @@
 };
 
 &cpm_i2c0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&cpm_i2c0_pins>;
        status = "okay";
        clock-frequency = <100000>;
 };
 
+&cpm_pinctl {
+               /* MPP Bus:
+                * TDM   [0-11]
+                * SPI   [13-16]
+                * SATA1 [28]
+                * UART0 [29-30]
+                * SMI   [32,34]
+                * XSMI  [35-36]
+                * I2C   [37-38]
+                * RGMII1[44-55]
+                * SD    [56-62]
+                */
+               /*   0   1   2   3   4   5   6   7   8   9 */
+       pin-func = < 4   4   4   4   4   4   4   4   4   4
+                    4   4   0   3   3   3   3   0   0   0
+                    0   0   0   0   0   0   0   0   9   0xA
+                    0xA 0   7   0   7   7   7   2   2   0
+                    0   0   0   0   1   1   1   1   1   1
+                    1   1   1   1   1   1   0xE 0xE 0xE 0xE
+                    0xE 0xE 0xE >;
+};
+
 &cpm_spi1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&cpm_spi0_pins>;
        status = "okay";
 
        spi-flash@0 {
@@ -122,8 +159,8 @@
 
 &cpm_comphy {
        phy0 {
-               phy-type = <PHY_TYPE_SGMII2>;
-               phy-speed = <PHY_SPEED_3_125G>;
+               phy-type = <PHY_TYPE_SGMII1>;
+               phy-speed = <PHY_SPEED_1_25G>;
        };
 
        phy1 {
@@ -132,8 +169,7 @@
        };
 
        phy2 {
-               phy-type = <PHY_TYPE_SGMII0>;
-               phy-speed = <PHY_SPEED_1_25G>;
+               phy-type = <PHY_TYPE_SFI>;
        };
 
        phy3 {
@@ -159,3 +195,47 @@
 &cpm_utmi1 {
        status = "okay";
 };
+
+&ap_sdhci0 {
+       status = "okay";
+       bus-width = <4>;
+       no-1-8-v;
+       non-removable;
+};
+
+&cpm_sdhci0 {
+       status = "okay";
+       bus-width = <4>;
+       no-1-8-v;
+       non-removable;
+};
+
+&cpm_mdio {
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+       };
+};
+
+&cpm_ethernet {
+       status = "okay";
+};
+
+&cpm_eth0 {
+       status = "okay";
+       phy-mode = "sfi"; /* lane-2 */
+};
+
+&cpm_eth1 {
+       status = "okay";
+       phy = <&phy0>;
+       phy-mode = "sgmii";
+};
+
+&cpm_eth2 {
+       status = "okay";
+       phy = <&phy1>;
+       phy-mode = "rgmii-id";
+};