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

Commit 8e694cd2 authored by Iyappan Subramanian's avatar Iyappan Subramanian Committed by David S. Miller
Browse files

dtb: xgene: Add MDIO node 



Added mdio node for mdio driver.  Also added phy-handle
reference to the ethernet nodes.

Removed unused clock node from storm sgenet1.

Signed-off-by: default avatarIyappan Subramanian <isubramanian@apm.com>
Tested-by: default avatarFushen Chen <fchen@apm.com>
Tested-by: default avatarToan Le <toanle@apm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52d1fd99

arch/arm64/boot/dts/apm/apm-merlin.dts

+6 −0
Original line number Diff line number Diff line
@@ -83,3 +83,9 @@ 
		status = "ok";

	};

};



&mdio {

	sgenet0phy: phy@0 {

		reg = <0x0>;

	};

};

arch/arm64/boot/dts/apm/apm-mustang.dts

+12 −0
Original line number Diff line number Diff line
@@ -79,3 +79,15 @@ 
&mmc0 {

	status = "ok";

};



&mdio {

	menet0phy: phy@3 {

		reg = <0x3>;

	};

	sgenet0phy: phy@4 {

		reg = <0x4>;

	};

	sgenet1phy: phy@5 {

		reg = <0x5>;

	};

};

arch/arm64/boot/dts/apm/apm-shadowcat.dtsi

+10 −1
Original line number Diff line number Diff line
@@ -625,10 +625,18 @@ 
			apm,irq-start = <8>;

		};



		mdio: mdio@1f610000 {

			compatible = "apm,xgene-mdio-xfi";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0 0x1f610000 0x0 0xd100>;

			clocks = <&xge0clk 0>;

		};



		sgenet0: ethernet@1f610000 {

			compatible = "apm,xgene2-sgenet";

			status = "disabled";

			reg = <0x0 0x1f610000 0x0 0x10000>,

			reg = <0x0 0x1f610000 0x0 0xd100>,

			      <0x0 0x1f600000 0x0 0Xd100>,

			      <0x0 0x20000000 0x0 0X20000>;

			interrupts = <0 96 4>,
@@ -637,6 +645,7 @@ 
			clocks = <&xge0clk 0>;

			local-mac-address = [00 01 73 00 00 01];

			phy-connection-type = "sgmii";

			phy-handle = <&sgenet0phy>;

		};



		xgenet1: ethernet@1f620000 {

arch/arm64/boot/dts/apm/apm-storm.dtsi

+13 −13
Original line number Diff line number Diff line
@@ -237,20 +237,11 @@ 
				clocks = <&socplldiv2 0>;

				reg = <0x0 0x1f21c000 0x0 0x1000>;

				reg-names = "csr-reg";

				csr-mask = <0x3>;

				csr-mask = <0xa>;

				enable-mask = <0xf>;

				clock-output-names = "sge0clk";

			};



			sge1clk: sge1clk@1f21c000 {

				compatible = "apm,xgene-device-clock";

				#clock-cells = <1>;

				clocks = <&socplldiv2 0>;

				reg = <0x0 0x1f21c000 0x0 0x1000>;

				reg-names = "csr-reg";

				csr-mask = <0xc>;

				clock-output-names = "sge1clk";

			};



			xge0clk: xge0clk@1f61c000 {

				compatible = "apm,xgene-device-clock";

				#clock-cells = <1>;
@@ -921,6 +912,14 @@ 
			clocks = <&rtcclk 0>;

		};



		mdio: mdio@17020000 {

			compatible = "apm,xgene-mdio-rgmii";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0 0x17020000 0x0 0xd100>;

			clocks = <&menetclk 0>;

		};



		menet: ethernet@17020000 {

			compatible = "apm,xgene-enet";

			status = "disabled";
@@ -934,7 +933,7 @@ 
			/* mac address will be overwritten by the bootloader */

			local-mac-address = [00 00 00 00 00 00];

			phy-connection-type = "rgmii";

			phy-handle = <&menetphy>;

			phy-handle = <&menet0phy>,<&menetphy>;

			mdio {

				compatible = "apm,xgene-mdio";

				#address-cells = <1>;
@@ -960,6 +959,7 @@ 
			clocks = <&sge0clk 0>;

			local-mac-address = [00 00 00 00 00 00];

			phy-connection-type = "sgmii";

			phy-handle = <&sgenet0phy>;

		};



		sgenet1: ethernet@1f210030 {
@@ -973,9 +973,9 @@ 
				     <0x0 0xAD 0x4>;

			port-id = <1>;

			dma-coherent;

			clocks = <&sge1clk 0>;

			local-mac-address = [00 00 00 00 00 00];

			phy-connection-type = "sgmii";

			phy-handle = <&sgenet1phy>;

		};



		xgenet: ethernet@1f610000 {