Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05e121af authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

Merge tag 'marvell-boards-net-for-3.8' of... 

Merge tag 'marvell-boards-net-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge

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
parents bb4f6ce2 9f32cccc

arch/arm/boot/dts/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -44,7 +44,9 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ 
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

	msm8960-cdp.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \

	armada-xp-db.dtb

	armada-370-mirabox.dtb \

	armada-xp-db.dtb \

	armada-xp-openblocks-ax3-4.dtb

dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \

	imx53-ard.dtb \

	imx53-evk.dtb \

arch/arm/boot/dts/armada-370-db.dts

+23 −0
Original line number Diff line number Diff line
@@ -38,5 +38,28 @@ 
			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";

		};

	};

};

arch/arm/boot/dts/armada-370-mirabox.dts

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * Device Tree file for Globalscale Mirabox

 *

 * Gregory CLEMENT <gregory.clement@free-electrons.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



/dts-v1/;

/include/ "armada-370.dtsi"



/ {

	model = "Globalscale Mirabox";

	compatible = "globalscale,mirabox", "marvell,armada370", "marvell,armada-370-xp";



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

	};



	memory {

		device_type = "memory";

		reg = <0x00000000 0x20000000>; /* 512 MB */

	};



	soc {

		serial@d0012000 {

			clock-frequency = <200000000>;

			status = "okay";

		};

		timer@d0020300 {

			clock-frequency = <600000000>;

			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";

		};

	};

};

arch/arm/boot/dts/armada-370-xp.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -79,6 +79,26 @@ 
			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";

		};

	};

};

arch/arm/boot/dts/armada-xp-db.dts

+43 −0
Original line number Diff line number Diff line
@@ -50,5 +50,48 @@ 
			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";

		};

	};

};