From f5fc9044e5d45a4d97b5240c8723f4677f647c9f Mon Sep 17 00:00:00 2001 From: Matthew Hagan Date: Sun, 29 Aug 2021 22:37:51 +0000 Subject: [PATCH] ARM: dts: NSP: Fix MX65 MDIO mux warnings The naming of this node is based upon that of the initial EA9500 dts[1]. However this does not conform with the mdio-mux format, yielding the following message when running dtbs_check: mdio-mii-mux: $nodename:0: 'mdio-mii-mux' does not match '^mdio-mux[\\-@]?' Secondly, this node should be moved to within the axi node and given the appropriate unit address. This also requires exposing the axi node via a label in bcm-nsp.dtsi. This fixes the following warning: Warning (unit_address_vs_reg): /mdio-mii-mux: node has a reg or ranges property, but no unit name [1]https://patchwork.ozlabs.org/project/linux-imx/patch/20180618174159.86150-1-npcomplete13@gmail.com/#1941353 Signed-off-by: Matthew Hagan Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index 1808275..1c08daa 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -166,7 +166,7 @@ }; }; - axi@18000000 { + axi: axi@18000000 { compatible = "simple-bus"; ranges = <0x00000000 0x18000000 0x0011c40c>; #address-cells = <1>; diff --git a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi index 57d0c5e..102acd8 100644 --- a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi +++ b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi @@ -70,10 +70,12 @@ gpios = <&gpioa 31 GPIO_ACTIVE_HIGH>; }; }; +}; - mdio-mii-mux { +&axi { + mdio-mux@3f1c0 { compatible = "mdio-mux-mmioreg", "mdio-mux"; - reg = <0x1803f1c0 0x4>; + reg = <0x3f1c0 0x4>; mux-mask = <0x2000>; mdio-parent-bus = <&mdio_ext>; #address-cells = <1>; -- 2.7.4