summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2019-08-14 07:22:08 +0300
committerMaxime Ripard <maxime.ripard@bootlin.com>2019-08-23 10:14:48 +0300
commit968f2c9169399fce43c11a89cbf4ac697f86de6e (patch)
tree2be7690eae204ccb2620fc9f4635284648be3be7 /arch/arm/boot/dts/sun6i-a31-hummingbird.dts
parentf46f408c152ac925e56c0f38138ae49ba16bbc23 (diff)
downloadlinux-968f2c9169399fce43c11a89cbf4ac697f86de6e.tar.xz
ARM: dts: sunxi: Add mdio bus sub-node to GMAC
The DWMAC binding never supported having the Ethernet PHY node as a direct child to the controller, nor did it support the "phy" property as a way to specify which Ethernet PHY to use. What seemed to work was simply the implementation ignoring the "phy" property and instead probing all addresses on the MDIO bus and using the first available one. The recent switch from "phy" to "phy-handle" breaks the assumptions of the implementation, and does not match what the binding requires. The binding requires that if an MDIO bus is described, it shall be a sub-node with the "snps,dwmac-mdio" compatible string. Add a device node for the MDIO bus, and move the Ethernet PHY node under it. Also fix up the #address-cells and #size-cells properties where needed. Fixes: de332de26d19 ("ARM: dts: sunxi: Switch from phy to phy-handle") Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'arch/arm/boot/dts/sun6i-a31-hummingbird.dts')
-rw-r--r--arch/arm/boot/dts/sun6i-a31-hummingbird.dts16
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index 7c611ddbaf2f..049e6ab3cf56 100644
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -156,13 +156,6 @@
phy-handle = <&phy1>;
phy-mode = "rgmii";
status = "okay";
-
- phy1: ethernet-phy@1 {
- reg = <1>;
- reset-gpios = <&pio 0 21 GPIO_ACTIVE_LOW>;
- reset-assert-us = <10000>;
- reset-deassert-us = <30000>;
- };
};
&hdmi {
@@ -199,6 +192,15 @@
status = "okay";
};
+&mdio {
+ phy1: ethernet-phy@1 {
+ reg = <1>;
+ reset-gpios = <&pio 0 21 GPIO_ACTIVE_LOW>;
+ reset-assert-us = <10000>;
+ reset-deassert-us = <30000>;
+ };
+};
+
&mmc0 {
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;