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 63442df8f390ce7e00bd704466668ad466c7f4a6..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"
@@ -158,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 {
@@ -168,8 +169,7 @@
        };
 
        phy2 {
-               phy-type = <PHY_TYPE_SGMII0>;
-               phy-speed = <PHY_SPEED_1_25G>;
+               phy-type = <PHY_TYPE_SFI>;
        };
 
        phy3 {
@@ -209,3 +209,33 @@
        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";
+};