mediatek: dts: fix some minor dtc warnings

This patch fixes the following dtc warnings for the recently added
boards:

../dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts:329.35-331.4: Warning (unit_address_format): /soc/spi@1100a000/spi_nand@0/partitions/partition@180000/macaddr@004: unit name should not have leading 0s
../dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts:332.35-334.4: Warning (unit_address_format): /soc/spi@1100a000/spi_nand@0/partitions/partition@180000/macaddr@02a: unit name should not have leading 0s
../dts/mt7981b-iptime-ax3000q.dts:267.3-13: Warning (reg_format): /soc/wifi@18000000/band@0:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)
../dts/mt7981b-iptime-ax3000q.dts:273.3-13: Warning (reg_format): /soc/wifi@18000000/band@1:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)
../dts/mt7981b-iptime-ax3000sm.dts:269.3-13: Warning (reg_format): /soc/wifi@18000000/band@0:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)
../dts/mt7981b-iptime-ax3000sm.dts:275.3-13: Warning (reg_format): /soc/wifi@18000000/band@1:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)
../dts/mt7981b-snr-snr-cpe-ax2.dts:330.3-13: Warning (reg_format): /soc/wifi@18000000/band@0:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)
../dts/mt7981b-snr-snr-cpe-ax2.dts:336.3-13: Warning (reg_format): /soc/wifi@18000000/band@1:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)
../dts/mt7981b-gatonetworks-gdsp-sd-boot.dtso:14.5-15: Warning (reg_format): /fragment@1/__overlay__/card@0:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)
mt7988a-rfb-emmc.dtso:34.5-15: Warning (reg_format): /fragment@0/__overlay__/card@0:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)
mt7988a-rfb-snfi-nand.dtso:29.7-33: Warning (reg_format): /fragment@0/__overlay__/flash@0/partitions/partition@0:reg: property has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
mt7988a-rfb-snfi-nand.dtso:35.7-35: Warning (reg_format): /fragment@0/__overlay__/flash@0/partitions/partition@200000:reg: property has invalid length (8 bytes) (#address-cells == 2, #size-cells == 1)
mt7988a-rfb-sd.dtso:32.5-15: Warning (reg_format): /fragment@0/__overlay__/card@0:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)

Signed-off-by: Shiji Yang <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/19741
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/mediatek/dts/mt7981b-gatonetworks-gdsp-sd-boot.dtso b/target/linux/mediatek/dts/mt7981b-gatonetworks-gdsp-sd-boot.dtso
index 46a07cf68350e64488e31e719c2e08cdc7bc8eed..98b00217b949d263ad6a6213b69c74a53b8ad4e6 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-gatonetworks-gdsp-sd-boot.dtso
+++ b/target/linux/mediatek/dts/mt7981b-gatonetworks-gdsp-sd-boot.dtso
@@ -9,6 +9,8 @@
        fragment@1 {
                target = <&mmc0>;
                __overlay__ {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        card@0 {
                                compatible = "mmc-card";
                                reg = <0>;

diff --git a/target/linux/mediatek/dts/mt7981b-iptime-ax3000q.dts b/target/linux/mediatek/dts/mt7981b-iptime-ax3000q.dts
index 89b797666e4165e23033772b723d70b34f5d1f45..d3bb26d3986ca4af96be6d69b2d83d73d38cda52 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-iptime-ax3000q.dts
+++ b/target/linux/mediatek/dts/mt7981b-iptime-ax3000q.dts
@@ -260,6 +260,8 @@
 
 &wifi {
        status = "okay";
+       #address-cells = <1>;
+       #size-cells = <0>;
        nvmem-cell-names = "eeprom";
        nvmem-cells = <&eeprom_factory_0>;
 

diff --git a/target/linux/mediatek/dts/mt7981b-iptime-ax3000sm.dts b/target/linux/mediatek/dts/mt7981b-iptime-ax3000sm.dts
index 1b1ba3dedab244d6f52d0476eeaf6742bb47853c..3cf854a9d8cf26e99676147339b93f92b7e94c9b 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-iptime-ax3000sm.dts
+++ b/target/linux/mediatek/dts/mt7981b-iptime-ax3000sm.dts
@@ -262,6 +262,8 @@
 
 &wifi {
        status = "okay";
+       #address-cells = <1>;
+       #size-cells = <0>;
        nvmem-cell-names = "eeprom";
        nvmem-cells = <&eeprom_factory_0>;
 

diff --git a/target/linux/mediatek/dts/mt7981b-snr-snr-cpe-ax2.dts b/target/linux/mediatek/dts/mt7981b-snr-snr-cpe-ax2.dts
index 48e29d3a6ec4523a6a30cbf8592d175fd68ae464..c25359bdeebd8f5fa5bfee2f49889b6399183053 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-snr-snr-cpe-ax2.dts
+++ b/target/linux/mediatek/dts/mt7981b-snr-snr-cpe-ax2.dts
@@ -323,6 +323,8 @@
 
 &wifi {
        status = "okay";
+       #address-cells = <1>;
+       #size-cells = <0>;
        nvmem-cell-names = "eeprom";
        nvmem-cells = <&eeprom_factory_0>;
 

diff --git a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts
index 0d886e7a989f4355cd5540a929664ed80e4b7e0a..fae0cfbb41d9e957309a98af0dd9b4a93a68c22b 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts
+++ b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts
@@ -326,11 +326,11 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
-       macaddr_factory_004: macaddr@004 {
-               reg = <0x004 0x6>;
+       macaddr_factory_004: macaddr@4 {
+               reg = <0x4 0x6>;
        };
-       macaddr_factory_02a: macaddr@02a {
-               reg = <0x02a 0x6>;
+       macaddr_factory_02a: macaddr@2a {
+               reg = <0x2a 0x6>;
        };
         eeprom_factory: eeprom@0 {
                reg = <0x0 0x1000>;

diff --git a/target/linux/mediatek/patches-6.12/188-arm64-dts-mediatek-add-MT7988A-reference-board-devic.patch b/target/linux/mediatek/patches-6.12/188-arm64-dts-mediatek-add-MT7988A-reference-board-devic.patch
index f968ac15cfe8eb51abcc196c6628a516b964f248..0e0236c5fcc3106915e93c1002edad61084c0e7a 100644 (file)
--- a/target/linux/mediatek/patches-6.12/188-arm64-dts-mediatek-add-MT7988A-reference-board-devic.patch
+++ b/target/linux/mediatek/patches-6.12/188-arm64-dts-mediatek-add-MT7988A-reference-board-devic.patch
@@ -56,7 +56,7 @@ Signed-off-by: Daniel Golle <[email protected]>
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana.dtb
 --- /dev/null
 +++ b/arch/arm64/boot/dts/mediatek/mt7988a-rfb-emmc.dtso
-@@ -0,0 +1,60 @@
+@@ -0,0 +1,62 @@
 +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 +/*
 + * Copyright (C) 2021 MediaTek Inc.
@@ -72,6 +72,8 @@ Signed-off-by: Daniel Golle <[email protected]>
 +      fragment@0 {
 +              target = <&mmc0>;
 +              __overlay__ {
++                      #address-cells = <1>;
++                      #size-cells = <0>;
 +                      pinctrl-names = "default", "state_uhs";
 +                      pinctrl-0 = <&mmc0_pins_emmc_51>;
 +                      pinctrl-1 = <&mmc0_pins_emmc_51>;
@@ -424,7 +426,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 +};
 --- /dev/null
 +++ b/arch/arm64/boot/dts/mediatek/mt7988a-rfb-sd.dtso
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,60 @@
 +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 +/*
 + * Copyright (C) 2023 MediaTek Inc.
@@ -442,6 +444,8 @@ Signed-off-by: Daniel Golle <[email protected]>
 +      fragment@0 {
 +              target-path = <&mmc0>;
 +              __overlay__ {
++                      #address-cells = <1>;
++                      #size-cells = <0>;
 +                      pinctrl-names = "default", "state_uhs";
 +                      pinctrl-0 = <&mmc0_pins_sdcard>;
 +                      pinctrl-1 = <&mmc0_pins_sdcard>;
@@ -485,7 +489,7 @@ Signed-off-by: Daniel Golle <[email protected]>
 +};
 --- /dev/null
 +++ b/arch/arm64/boot/dts/mediatek/mt7988a-rfb-snfi-nand.dtso
-@@ -0,0 +1,81 @@
+@@ -0,0 +1,85 @@
 +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
 +/*
 + * Copyright (C) 2022 MediaTek Inc.
@@ -512,6 +516,10 @@ Signed-off-by: Daniel Golle <[email protected]>
 +                              spi-rx-bus-width = <4>;
 +
 +                              partitions {
++                                      compatible = "fixed-partitions";
++                                      #address-cells = <1>;
++                                      #size-cells = <1>;
++
 +                                      partition@0 {
 +                                              label = "BL2";
 +                                              reg = <0x00000 0x0200000>;