Skip to content

Commit 2cc0bfc

Browse files
Russell KingShawn Guo
authored andcommitted
ARM: dts: imx6qdl-sr-som: fix some cubox-i platforms
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: 86b08bd ("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> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
1 parent a88afa4 commit 2cc0bfc

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

arch/arm/boot/dts/imx6qdl-sr-som.dtsi

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
&fec {
5454
pinctrl-names = "default";
5555
pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;
56-
phy-handle = <&phy>;
5756
phy-mode = "rgmii-id";
5857
phy-reset-duration = <2>;
5958
phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
@@ -63,10 +62,19 @@
6362
#address-cells = <1>;
6463
#size-cells = <0>;
6564

66-
phy: ethernet-phy@0 {
65+
/*
66+
* The PHY can appear at either address 0 or 4 due to the
67+
* configuration (LED) pin not being pulled sufficiently.
68+
*/
69+
ethernet-phy@0 {
6770
reg = <0>;
6871
qca,clk-out-frequency = <125000000>;
6972
};
73+
74+
ethernet-phy@4 {
75+
reg = <4>;
76+
qca,clk-out-frequency = <125000000>;
77+
};
7078
};
7179
};
7280

0 commit comments

Comments
 (0)