| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | From f5fc9044e5d45a4d97b5240c8723f4677f647c9f Mon Sep 17 00:00:00 2001 |
| 2 | From: Matthew Hagan <mnhagan88@gmail.com> |
| 3 | Date: Sun, 29 Aug 2021 22:37:51 +0000 |
| 4 | Subject: [PATCH] ARM: dts: NSP: Fix MX65 MDIO mux warnings |
| 5 | |
| 6 | The naming of this node is based upon that of the initial EA9500 dts[1]. |
| 7 | However this does not conform with the mdio-mux format, yielding the |
| 8 | following message when running dtbs_check: |
| 9 | mdio-mii-mux: $nodename:0: 'mdio-mii-mux' does not match '^mdio-mux[\\-@]?' |
| 10 | |
| 11 | Secondly, this node should be moved to within the axi node and given the |
| 12 | appropriate unit address. This also requires exposing the axi node via a |
| 13 | label in bcm-nsp.dtsi. This fixes the following warning: |
| 14 | Warning (unit_address_vs_reg): /mdio-mii-mux: node has a reg or ranges property, but no unit name |
| 15 | |
| 16 | [1]https://patchwork.ozlabs.org/project/linux-imx/patch/20180618174159.86150-1-npcomplete13@gmail.com/#1941353 |
| 17 | |
| 18 | Signed-off-by: Matthew Hagan <mnhagan88@gmail.com> |
| 19 | Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| 20 | --- |
| 21 | arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- |
| 22 | arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi | 6 ++++-- |
| 23 | 2 files changed, 5 insertions(+), 3 deletions(-) |
| 24 | |
| 25 | --- a/arch/arm/boot/dts/bcm-nsp.dtsi |
| 26 | +++ b/arch/arm/boot/dts/bcm-nsp.dtsi |
| 27 | @@ -166,7 +166,7 @@ |
| 28 | }; |
| 29 | }; |
| 30 | |
| 31 | - axi@18000000 { |
| 32 | + axi: axi@18000000 { |
| 33 | compatible = "simple-bus"; |
| 34 | ranges = <0x00000000 0x18000000 0x0011c40c>; |
| 35 | #address-cells = <1>; |
| 36 | --- a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi |
| 37 | +++ b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi |
| 38 | @@ -70,10 +70,12 @@ |
| 39 | gpios = <&gpioa 31 GPIO_ACTIVE_HIGH>; |
| 40 | }; |
| 41 | }; |
| 42 | +}; |
| 43 | |
| 44 | - mdio-mii-mux { |
| 45 | +&axi { |
| 46 | + mdio-mux@3f1c0 { |
| 47 | compatible = "mdio-mux-mmioreg", "mdio-mux"; |
| 48 | - reg = <0x1803f1c0 0x4>; |
| 49 | + reg = <0x3f1c0 0x4>; |
| 50 | mux-mask = <0x2000>; |
| 51 | mdio-parent-bus = <&mdio_ext>; |
| 52 | #address-cells = <1>; |