| Message ID | 20220215080937.2263111-4-o.rempel@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | aa8ea8cc95dec8bc7370773271e133c1b3cc864a |
| Headers | show |
| Series | [v3,1/8] dt-bindings: net: add schema for ASIX USB Ethernet controllers | expand |
On 2/15/22 12:09 AM, Oleksij Rempel wrote: > It should be "ethernet@x" instead of "usbether@x" > > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> This looks like, a quick grep on the u-boot source code seems to suggest that only one file is assuming that 'usbether@1' is to be used as a node name and the error message does not even match the code it is patching: board/liebherr/xea/xea.c: #ifdef CONFIG_OF_BOARD_SETUP static int fdt_fixup_l2switch(void *blob) { u8 ethaddr[6]; int ret; if (eth_env_get_enetaddr("ethaddr", ethaddr)) { ret = fdt_find_and_setprop(blob, "/ahb@80080000/switch@800f0000", "local-mac-address", ethaddr, 6, 1); if (ret < 0) printf("%s: can't find usbether@1 node: %d\n", __func__, ret); } return 0; } I will wait for the other maintainers on the other patches to provide some feedback, but if all is well, will apply this one soon.
On Tue, Feb 15, 2022 at 01:01:06PM -0800, Florian Fainelli wrote: > On 2/15/22 12:09 AM, Oleksij Rempel wrote: > > It should be "ethernet@x" instead of "usbether@x" > > > > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > > This looks like, a quick grep on the u-boot source code seems to suggest > that only one file is assuming that 'usbether@1' is to be used as a node > name and the error message does not even match the code it is patching: > > board/liebherr/xea/xea.c: > #ifdef CONFIG_OF_BOARD_SETUP > static int fdt_fixup_l2switch(void *blob) > { > u8 ethaddr[6]; > int ret; > > if (eth_env_get_enetaddr("ethaddr", ethaddr)) { > ret = fdt_find_and_setprop(blob, > > "/ahb@80080000/switch@800f0000", > "local-mac-address", > ethaddr, 6, 1); > if (ret < 0) > printf("%s: can't find usbether@1 node: %d\n", > __func__, ret); > } \o/ :) > return 0; > } > > I will wait for the other maintainers on the other patches to provide > some feedback, but if all is well, will apply this one soon. Full path fdt matching has proven to be not stable enough. Especially on chips with early DT adaptation like iMX. It is better to use aliases where possible. Regards, Oleksij
diff --git a/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi b/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi index 967e081cb9c2..882b13807075 100644 --- a/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi +++ b/arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi @@ -12,7 +12,7 @@ usb1@1 { #address-cells = <1>; #size-cells = <0>; - ethernet: usbether@1 { + ethernet: ethernet@1 { compatible = "usb424,ec00"; reg = <1>; }; diff --git a/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi b/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi index dc7ae776db5f..4273b90b53cc 100644 --- a/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi +++ b/arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi @@ -11,7 +11,7 @@ usb1@1 { #address-cells = <1>; #size-cells = <0>; - ethernet: usbether@1 { + ethernet: ethernet@1 { compatible = "usb424,ec00"; reg = <1>; };
It should be "ethernet@x" instead of "usbether@x" Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi | 2 +- arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)