system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-08 20:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: sunxi: Add mdio bus sub-node to GMAC

Browse source 
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: de332de26d ("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>
This commit is contained in:
Chen-Yu Tsai 2019-08-14 12:22:08 +08:00 committed by Maxime Ripard
parent f46f408c15
commit 968f2c9169
No known key found for this signature in database
GPG key ID: E3EF0D6F671851C5
34 changed files with 204 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/boot/dts/sun6i-a31-colombus.dts
View file

@ -79,10 +79,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "rgmii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&i2c0 {
@ -104,6 +100,12 @@ mma8452: mma8452@1d {
};
};
&mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>;

16
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
View file

@ -156,13 +156,6 @@ &gmac {
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 @@ &ir {
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>;

10
arch/arm/boot/dts/sun6i-a31-i7.dts
View file

@ -120,10 +120,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "mii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&hdmi {
@ -142,6 +138,12 @@ &ir {
status = "okay";
};
&mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun6i-a31-m9.dts
View file

@ -88,10 +88,6 @@ &gmac {
phy-mode = "mii";
phy-supply = <&reg_dldo1>;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&ir {
@ -100,6 +96,12 @@ &ir {
status = "okay";
};
&mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;

10
arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
View file

@ -88,10 +88,6 @@ &gmac {
phy-mode = "mii";
phy-supply = <&reg_dldo1>;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&ir {
@ -100,6 +96,12 @@ &ir {
status = "okay";
};
&mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;

8
arch/arm/boot/dts/sun6i-a31.dtsi
View file

@ -939,8 +939,12 @@ gmac: ethernet@1c30000 {
snps,fixed-burst;
snps,force_sf_dma_mode;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
mdio: mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
};
};
crypto: crypto-engine@1c15000 {

9
arch/arm/boot/dts/sun6i-a31s-cs908.dts
View file

@ -70,9 +70,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "mii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&ir {
@ -81,6 +78,12 @@ &ir {
status = "okay";
};
&mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&ohci1 {
status = "okay";
};

10
arch/arm/boot/dts/sun6i-a31s-sina31s.dts
View file

@ -119,10 +119,6 @@ &gmac {
phy-mode = "mii";
phy-supply = <&reg_dldo1>;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&hdmi {
@ -160,6 +156,12 @@ button-349 {
};
};
&mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;

16
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
View file

@ -96,13 +96,6 @@ &gmac {
phy-mode = "rgmii";
phy-supply = <&reg_dldo1>;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
reset-gpios = <&pio 0 21 GPIO_ACTIVE_LOW>; /* PA21 */
reset-assert-us = <10000>;
reset-deassert-us = <30000>;
};
};
&ir {
@ -111,6 +104,15 @@ &ir {
status = "okay";
};
&mdio {
phy1: ethernet-phy@1 {
reg = <1>;
reset-gpios = <&pio 0 21 GPIO_ACTIVE_LOW>; /* PA21 */
reset-assert-us = <10000>;
reset-deassert-us = <30000>;
};
};
&mmc0 {
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
View file

@ -133,10 +133,6 @@ &gmac {
phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&hdmi {
@ -171,6 +167,12 @@ &ir0 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-bananapi.dts
View file

@ -135,10 +135,6 @@ &gmac {
phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&hdmi {
@ -171,6 +167,12 @@ &ir0 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-bananapro.dts
View file

@ -113,10 +113,6 @@ &gmac {
phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&i2c0 {
@ -143,6 +139,12 @@ &ir0 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
View file

@ -118,10 +118,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "mii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&hdmi {
@ -161,6 +157,12 @@ &mmc0 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&ohci0 {
status = "okay";
};

10
arch/arm/boot/dts/sun7i-a20-cubietruck.dts
View file

@ -153,10 +153,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "rgmii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&hdmi {
@ -194,6 +190,12 @@ &ir0 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

18
arch/arm/boot/dts/sun7i-a20-hummingbird.dts
View file

@ -104,14 +104,6 @@ &gmac {
phy-mode = "rgmii";
phy-supply = <&reg_gmac_vdd>;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
reset-gpios = <&pio 0 17 GPIO_ACTIVE_LOW>; /* PA17 */
reset-assert-us = <10000>;
/* wait 1s after reset, otherwise fail to read phy id */
reset-deassert-us = <1000000>;
};
};
&i2c0 {
@ -145,6 +137,16 @@ &ir0 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
reset-gpios = <&pio 0 17 GPIO_ACTIVE_LOW>; /* PA17 */
reset-assert-us = <10000>;
/* wait 1s after reset, otherwise fail to read phy id */
reset-deassert-us = <1000000>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
View file

@ -119,10 +119,6 @@ &gmac {
phy-mode = "mii";
phy-supply = <&reg_gmac_3v3>;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&i2c0 {
@ -145,6 +141,12 @@ &ir0 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
View file

@ -79,10 +79,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "mii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&i2c0 {
@ -99,6 +95,12 @@ &i2c1 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

2
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
View file

@ -100,7 +100,9 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "mii";
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};

2
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
View file

@ -123,8 +123,6 @@ &gmac {
phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>;
status = "okay";
/delete-property/#address-cells;
/delete-property/#size-cells;
fixed-link {
speed = <1000>;

10
arch/arm/boot/dts/sun7i-a20-m3.dts
View file

@ -85,10 +85,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "mii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&i2c0 {
@ -111,6 +107,12 @@ &ir0 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
View file

@ -114,10 +114,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "rgmii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&hdmi {
@ -202,6 +198,12 @@ button-1400 {
};
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

18
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
View file

@ -109,14 +109,6 @@ &gmac {
phy-mode = "rgmii";
phy-supply = <&reg_vcc3v3>;
status = "okay";
phy3: ethernet-phy@3 {
reg = <3>;
reset-gpios = <&pio 0 17 GPIO_ACTIVE_LOW>; /* PA17 */
reset-assert-us = <10000>;
/* wait 1s after reset, otherwise fail to read phy id */
reset-deassert-us = <1000000>;
};
};
&hdmi {
@ -161,6 +153,16 @@ &ir0 {
status = "okay";
};
&gmac_mdio {
phy3: ethernet-phy@3 {
reg = <3>;
reset-gpios = <&pio 0 17 GPIO_ACTIVE_LOW>; /* PA17 */
reset-assert-us = <10000>;
/* wait 1s after reset, otherwise fail to read phy id */
reset-deassert-us = <1000000>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
View file

@ -109,10 +109,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "mii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&hdmi {
@ -149,6 +145,12 @@ eeprom: eeprom@50 {
};
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
View file

@ -114,10 +114,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "rgmii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&hdmi {
@ -154,6 +150,12 @@ &lradc {
vref-supply = <&reg_vcc3v0>;
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
View file

@ -121,10 +121,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "mii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&hdmi {
@ -215,6 +211,12 @@ button-1398 {
};
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
View file

@ -124,10 +124,6 @@ &gmac {
phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&hdmi {
@ -158,6 +154,12 @@ &ir0 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-orangepi.dts
View file

@ -100,10 +100,6 @@ &gmac {
phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&i2c0 {
@ -124,6 +120,12 @@ &ir0 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
View file

@ -117,10 +117,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "rgmii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&hdmi {
@ -149,6 +145,12 @@ &ir0 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
View file

@ -125,10 +125,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "mii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&i2c0 {
@ -149,6 +145,12 @@ &ir0 {
status = "okay";
};
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

10
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
View file

@ -84,10 +84,6 @@ &gmac {
phy-handle = <&phy1>;
phy-mode = "rgmii";
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&i2c0 {
@ -110,6 +106,12 @@ &i2c2 {
#include "axp209.dtsi"
&gmac_mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;

8
arch/arm/boot/dts/sun7i-a20.dtsi
View file

@ -1437,8 +1437,12 @@ gmac: ethernet@1c50000 {
snps,fixed-burst;
snps,force_sf_dma_mode;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
gmac_mdio: mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
};
};
hstimer@1c60000 {

10
arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
View file

@ -132,10 +132,6 @@ &gmac {
phy-mode = "rgmii";
phy-supply = <&reg_cldo1>;
status = "okay";
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&i2c3 {
@ -144,6 +140,12 @@ &i2c3 {
status = "okay";
};
&mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins>;

2
arch/arm/boot/dts/sun9i-a80-optimus.dts
View file

@ -127,7 +127,9 @@ &gmac {
phy-mode = "rgmii";
phy-supply = <&reg_cldo1>;
status = "okay";
};
&mdio {
phy1: ethernet-phy@1 {
reg = <1>;
};

8
arch/arm/boot/dts/sun9i-a80.dtsi
View file

@ -331,8 +331,12 @@ gmac: ethernet@830000 {
snps,fixed-burst;
snps,force_sf_dma_mode;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
mdio: mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
};
};
ehci0: usb@a00000 {