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

Commit f40788a6 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

Merge tag 'marvell-neta-dt-clk-updates-3.8' of... 

Merge tag 'marvell-neta-dt-clk-updates-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge

Marvell Ethernet DT update for clk support
parents a19aab57 42db1215

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

+0 −2
Original line number Diff line number Diff line
@@ -50,13 +50,11 @@ 
		};



		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 −2
Original line number Diff line number Diff line
@@ -43,13 +43,11 @@ 
			};

		};

		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

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
				compatible = "marvell,armada-370-neta";

				reg = <0xd0070000 0x2500>;

				interrupts = <8>;

				clocks = <&gateclk 4>;

				status = "disabled";

		};
@@ -97,6 +98,7 @@ 
				compatible = "marvell,armada-370-neta";

				reg = <0xd0074000 0x2500>;

				interrupts = <10>;

				clocks = <&gateclk 3>;

				status = "disabled";

		};

	};

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

+0 −4
Original line number Diff line number Diff line
@@ -71,25 +71,21 @@ 
		};



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

arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

+0 −4
Original line number Diff line number Diff line
@@ -85,25 +85,21 @@ 
		};



		ethernet@d0070000 {

			clock-frequency = <250000000>;

			status = "okay";

			phy = <&phy0>;

			phy-mode = "sgmii";

		};

		ethernet@d0074000 {

			clock-frequency = <250000000>;

			status = "okay";

			phy = <&phy1>;

			phy-mode = "sgmii";

		};

		ethernet@d0030000 {

			clock-frequency = <250000000>;

			status = "okay";

			phy = <&phy2>;

			phy-mode = "sgmii";

		};

		ethernet@d0034000 {

			clock-frequency = <250000000>;

			status = "okay";

			phy = <&phy3>;

			phy-mode = "sgmii";