mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 22:25:03 +00:00
Code Issues Releases Wiki Activity

i.MX fixes for 5.1, round 3:

Browse source 
- A fix on LS1021A-TWR board that SGMII PCS link remains down for
    eTSEC0 upon an ifdown/ifup sequence.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJcvTFYAAoJEFBXWFqHsHzOMjUIAI0yp8evhF7SKhz7IESfs4sk
 O7ER8WMJb11gWgQICEJCWshBfaj28kRO25INLJgA9Txm19wB7brfKv/wVlYSrQeU
 kIhKZHJkp3xVibfopuqWlq3jsZyoMSPzaLKGK8d8i2PE1ug6zDvTQAfebMtjKGxU
 kZjj2q3o7Vo81MK5aswy5ohMPyHfMszZbfgLVBbk5dY7X9W6F0abkRxReAjnfDrL
 QPMpMLCRHoIymPkTqDmsyQ090ZLZW+3XCL0lvDzfCVvlrvM3FaBb6HclzvZuaeBr
 TghmBIlc/as9Kgnh/kygDkDkUwKfE1t2ntaRFdxgqxwOpwtMw3RQ643FFGAAHtU=
 =BDC3
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-04-28 13:26:01 -07:00
commit ad41442106
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/boot/dts/ls1021a-twr.dts
View file

@ -145,7 +145,7 @@ dspiflash: s25fl064k@0 {
};
&enet0 {
tbi-handle = <&tbi1>;
tbi-handle = <&tbi0>;
phy-handle = <&sgmii_phy2>;
phy-connection-type = "sgmii";
status = "okay";
@ -225,6 +225,13 @@ rgmii_phy1: ethernet-phy@1 {
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";

11
arch/arm/boot/dts/ls1021a.dtsi
View file

@ -701,7 +701,7 @@ dcu: dcu@2ce0000 {
};
mdio0: mdio@2d24000 {
compatible = "gianfar";
compatible = "fsl,etsec2-mdio";
device_type = "mdio";
#address-cells = <1>;
#size-cells = <0>;
@ -709,6 +709,15 @@ mdio0: mdio@2d24000 {
<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>;