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

Commit ad414421 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-5.1-3' of... 

Merge tag 'imx-fixes-5.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

i.MX fixes for 5.1, round 3:
 - A fix on LS1021A-TWR board that SGMII PCS link remains down for
   eTSEC0 upon an ifdown/ifup sequence.

* tag 'imx-fixes-5.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: dts: ls1021: Fix SGMII PCS link remaining down after PHY disconnect

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c7edf197 c7861adb

arch/arm/boot/dts/ls1021a-twr.dts

+8 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ 
};



&enet0 {

	tbi-handle = <&tbi1>;

	tbi-handle = <&tbi0>;

	phy-handle = <&sgmii_phy2>;

	phy-connection-type = "sgmii";

	status = "okay";
@@ -225,6 +225,13 @@ 
	sgmii_phy2: ethernet-phy@2 {

		reg = <0x2>;

	};

	tbi0: tbi-phy@1f {

		reg = <0x1f>;

		device_type = "tbi-phy";

	};

};



&mdio1 {

	tbi1: tbi-phy@1f {

		reg = <0x1f>;

		device_type = "tbi-phy";

arch/arm/boot/dts/ls1021a.dtsi

+10 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ 
		};



		mdio0: mdio@2d24000 {

			compatible = "gianfar";

			compatible = "fsl,etsec2-mdio";

			device_type = "mdio";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -709,6 +709,15 @@ 
			      <0x0 0x2d10030 0x0 0x4>;

		};



		mdio1: mdio@2d64000 {

			compatible = "fsl,etsec2-mdio";

			device_type = "mdio";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0 0x2d64000 0x0 0x4000>,

			      <0x0 0x2d50030 0x0 0x4>;

		};



		ptp_clock@2d10e00 {

			compatible = "fsl,etsec-ptp";

			reg = <0x0 0x2d10e00 0x0 0xb0>;