Merge tag 'marvell-boards-net-for-3.8' of git://github.com/MISL-EBU-System-SW/mainlin...

Marvell boards changes related to Ethernet, for 3.8

Conflicts:
	arch/arm/boot/dts/armada-370-xp.dtsi
	arch/arm/boot/dts/armada-xp-db.dts

diff --cc arch/arm/boot/dts/armada-370-db.dts
index cfc080777da1dcabd653dc2dbf52e153558e3dee,76362f733d7b3633fe6a8bbce572bc5d20d67aa2..63120569878a0fbb161e5e82761cff69027182f6
--- 1/arch/arm/boot/dts/armada-370-db.dts
--- 2/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@@ -34,9 -34,32 +34,32 @@@
                        clock-frequency = <200000000>;
                        status = "okay";
                };
 -              timer@d0020300 {
 -                      clock-frequency = <600000000>;
 +              sata@d00a0000 {
 +                      nr-ports = <2>;
                        status = "okay";
                };
+ 
+               mdio {
+                       phy0: ethernet-phy@0 {
+                               reg = <0>;
+                       };
+ 
+                       phy1: ethernet-phy@1 {
+                               reg = <1>;
+                       };
+               };
+ 
+               ethernet@d0070000 {
+                       clock-frequency = <200000000>;
+                       status = "okay";
+                       phy = <&phy0>;
+                       phy-mode = "rgmii-id";
+               };
+               ethernet@d0074000 {
+                       clock-frequency = <200000000>;
+                       status = "okay";
+                       phy = <&phy1>;
+                       phy-mode = "rgmii-id";
+               };
        };
  };

diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
index 0abc8a16fc2532261565d5460d0da26f763e3126,643101b73306f15fa4f9ff31060affb88b2c1db1..4c248e30fcb37150aa4cf85c16541282bd479fce
--- 1/arch/arm/boot/dts/armada-370-xp.dtsi
--- 2/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@@ -70,15 -69,26 +70,35 @@@
                        reg = <0xd0020000 0x258>;
                };
  
 +              sata@d00a0000 {
 +                      compatible = "marvell,orion-sata";
 +                      reg = <0xd00a0000 0x2400>;
 +                      interrupts = <55>;
 +                      clocks = <&gateclk 15>, <&gateclk 30>;
 +                      clock-names = "0", "1";
 +                      status = "disabled";
 +              };
 +
+               mdio {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "marvell,orion-mdio";
+                       reg = <0xd0072004 0x4>;
+               };
+ 
+               ethernet@d0070000 {
+                               compatible = "marvell,armada-370-neta";
+                               reg = <0xd0070000 0x2500>;
+                               interrupts = <8>;
+                               status = "disabled";
+               };
+ 
+               ethernet@d0074000 {
+                               compatible = "marvell,armada-370-neta";
+                               reg = <0xd0074000 0x2500>;
+                               interrupts = <10>;
+                               status = "disabled";
+               };
        };
  };
  

diff --cc arch/arm/boot/dts/armada-xp-db.dts
index e59f14f14dd0d3cd0f440fd5bbc241af09dee703,b614bd054822797d52a452d2f3ff5a585ba19cae..ca1e0313556708882ab0c2c9c41d8e9d82253ed3
--- 1/arch/arm/boot/dts/armada-xp-db.dts
--- 2/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@@ -46,9 -46,48 +46,52 @@@
                        clock-frequency = <250000000>;
                        status = "okay";
                };
 +              sata@d00a0000 {
 +                      nr-ports = <2>;
 +                      status = "okay";
 +              };
+ 
+               mdio {
+                       phy0: ethernet-phy@0 {
+                               reg = <0>;
+                       };
+ 
+                       phy1: ethernet-phy@1 {
+                               reg = <1>;
+                       };
+ 
+                       phy2: ethernet-phy@2 {
+                               reg = <25>;
+                       };
+ 
+                       phy3: ethernet-phy@3 {
+                               reg = <27>;
+                       };
+               };
+ 
+               ethernet@d0070000 {
+                       clock-frequency = <250000000>;
+                       status = "okay";
+                       phy = <&phy0>;
+                       phy-mode = "rgmii-id";
+               };
+               ethernet@d0074000 {
+                       clock-frequency = <250000000>;
+                       status = "okay";
+                       phy = <&phy1>;
+                       phy-mode = "rgmii-id";
+               };
+               ethernet@d0030000 {
+                       clock-frequency = <250000000>;
+                       status = "okay";
+                       phy = <&phy2>;
+                       phy-mode = "sgmii";
+               };
+               ethernet@d0034000 {
+                       clock-frequency = <250000000>;
+                       status = "okay";
+                       phy = <&phy3>;
+                       phy-mode = "sgmii";
+               };
        };
  };

diff --cc arch/arm/boot/dts/armada-xp.dtsi
Simple merge