| Message ID | E1l00FW-0006G8-U5@rmk-PC.armlinux.org.uk |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] ARM: dts: imx6qdl-sr-som: fix some cubox-i platforms | expand |
On Thu, Jan 14, 2021 at 10:53:06AM +0000, Russell King wrote: > The PHY address bit 2 is configured by the LED pin. Attaching a LED > to this pin is not sufficient to guarantee this configuration pin is > correctly read. This leads to some platforms having their PHY at > address 0 and others at address 4. > > If there is no phy-handle specified, the FEC driver will scan the PHY > bus for a PHY and use that. Consequently, adding the DT configuration > of the PHY and the phy properties to the FEC driver broke some boards. > > Fix this by removing the phy-handle property, and listing two PHY > entries for both possible PHY addresses, so that the DT configuration > for the PHY can be found by the PHY driver. > > Fixes: 86b08bd5b994 ("ARM: dts: imx6-sr-som: add ethernet PHY configuration") > Reported-by: Christoph Mattheis <christoph.mattheis@arcor.de> > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > --- > arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/imx6qdl-sr-som.dtsi b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi > index b06577808ff4..1d1f9ec27045 100644 > --- a/arch/arm/boot/dts/imx6qdl-sr-som.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi > @@ -53,7 +53,6 @@ > &fec { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_microsom_enet_ar8035>; > - phy-handle = <&phy>; > phy-mode = "rgmii-id"; > phy-reset-duration = <2>; > phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; > @@ -63,10 +62,18 @@ > #address-cells = <1>; > #size-cells = <0>; > > - phy: ethernet-phy@0 { > + /* > + * The PHY can appear at either address 0 or 4 due to the > + * configuration (LED) pin not being pulled sufficiently. > + */ > + ethernet-phy@0 { > reg = <0>; > qca,clk-out-frequency = <125000000>; > }; > + ethernet-phy@4 { Let's have a newline between nodes. Fixed it up and applied. Shawn > + reg = <4>; > + qca,clk-out-frequency = <125000000>; > + }; > }; > }; > > -- > 2.20.1 >
diff --git a/arch/arm/boot/dts/imx6qdl-sr-som.dtsi b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi index b06577808ff4..1d1f9ec27045 100644 --- a/arch/arm/boot/dts/imx6qdl-sr-som.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi @@ -53,7 +53,6 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_microsom_enet_ar8035>; - phy-handle = <&phy>; phy-mode = "rgmii-id"; phy-reset-duration = <2>; phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; @@ -63,10 +62,18 @@ #address-cells = <1>; #size-cells = <0>; - phy: ethernet-phy@0 { + /* + * The PHY can appear at either address 0 or 4 due to the + * configuration (LED) pin not being pulled sufficiently. + */ + ethernet-phy@0 { reg = <0>; qca,clk-out-frequency = <125000000>; }; + ethernet-phy@4 { + reg = <4>; + qca,clk-out-frequency = <125000000>; + }; }; };
The PHY address bit 2 is configured by the LED pin. Attaching a LED to this pin is not sufficient to guarantee this configuration pin is correctly read. This leads to some platforms having their PHY at address 0 and others at address 4. If there is no phy-handle specified, the FEC driver will scan the PHY bus for a PHY and use that. Consequently, adding the DT configuration of the PHY and the phy properties to the FEC driver broke some boards. Fix this by removing the phy-handle property, and listing two PHY entries for both possible PHY addresses, so that the DT configuration for the PHY can be found by the PHY driver. Fixes: 86b08bd5b994 ("ARM: dts: imx6-sr-som: add ethernet PHY configuration") Reported-by: Christoph Mattheis <christoph.mattheis@arcor.de> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)