From 14362f22af62b74f61d6e7365fbf6960b048849e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 30 Nov 2023 12:08:31 -0800 Subject: [PATCH] ramips: fix dtc warnings Mostly leading 0 removals and wrong addresses. Signed-off-by: Rosen Penev --- target/linux/ramips/dts/mt7620a_engenius_epg600.dts | 4 ++-- target/linux/ramips/dts/mt7621_cudy_wr2100.dts | 2 +- target/linux/ramips/dts/mt7621_yuncore_fap640.dts | 6 +++--- target/linux/ramips/dts/mt7621_yuncore_fap690.dts | 6 +++--- target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts | 3 --- target/linux/ramips/dts/rt3662_engenius_esr600h.dts | 4 ++-- target/linux/ramips/dts/rt3883.dtsi | 4 +++- target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi | 2 +- 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a_engenius_epg600.dts b/target/linux/ramips/dts/mt7620a_engenius_epg600.dts index f64676d8fbb4..4b3332d2f074 100644 --- a/target/linux/ramips/dts/mt7620a_engenius_epg600.dts +++ b/target/linux/ramips/dts/mt7620a_engenius_epg600.dts @@ -215,9 +215,9 @@ }; &pcie0 { - wifi@0,1,0 { + wifi@0,0 { compatible = "pci1814,3091"; - reg = <0x0 1 0 0 0>; + reg = <0x0000 0 0 0 0>; nvmem-cells = <&eeprom_factory_0>; nvmem-cell-names = "eeprom"; }; diff --git a/target/linux/ramips/dts/mt7621_cudy_wr2100.dts b/target/linux/ramips/dts/mt7621_cudy_wr2100.dts index fc38e27ac185..afccce15ccdd 100644 --- a/target/linux/ramips/dts/mt7621_cudy_wr2100.dts +++ b/target/linux/ramips/dts/mt7621_cudy_wr2100.dts @@ -97,7 +97,7 @@ }; &pcie1 { - wifi@1,0 { + wifi@0,0 { compatible = "mediatek,mt76"; reg = <0x0000 0 0 0 0>; nvmem-cells = <&eeprom_factory_8000>; diff --git a/target/linux/ramips/dts/mt7621_yuncore_fap640.dts b/target/linux/ramips/dts/mt7621_yuncore_fap640.dts index 8c662b86cd4b..ddbeceaff8e4 100644 --- a/target/linux/ramips/dts/mt7621_yuncore_fap640.dts +++ b/target/linux/ramips/dts/mt7621_yuncore_fap640.dts @@ -129,8 +129,8 @@ #address-cells = <1>; #size-cells = <1>; - macaddr_factory_0004: macaddr@0004 { - reg = <0x0004 0x6>; + macaddr_factory_4: macaddr@4 { + reg = <0x4 0x6>; }; macaddr_factory_e006: macaddr@e006 { @@ -171,7 +171,7 @@ label = "wan"; phy-handle = <ðphy4>; - nvmem-cells = <&macaddr_factory_0004>; + nvmem-cells = <&macaddr_factory_4>; nvmem-cell-names = "mac-address"; }; diff --git a/target/linux/ramips/dts/mt7621_yuncore_fap690.dts b/target/linux/ramips/dts/mt7621_yuncore_fap690.dts index ce6a60215e27..ccfb0847aa14 100644 --- a/target/linux/ramips/dts/mt7621_yuncore_fap690.dts +++ b/target/linux/ramips/dts/mt7621_yuncore_fap690.dts @@ -99,8 +99,8 @@ #address-cells = <1>; #size-cells = <1>; - macaddr_factory_0004: macaddr@0004 { - reg = <0x0004 0x6>; + macaddr_factory_4: macaddr@4 { + reg = <0x4 0x6>; }; }; }; @@ -128,7 +128,7 @@ }; &gmac0 { - nvmem-cells = <&macaddr_factory_0004>; + nvmem-cells = <&macaddr_factory_4>; nvmem-cell-names = "mac-address"; }; diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts index 3bdb06cec92c..01c8bb942a07 100644 --- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts +++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts @@ -49,9 +49,6 @@ keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - reset { label = "reset"; gpios = <&gpio 11 GPIO_ACTIVE_LOW>; diff --git a/target/linux/ramips/dts/rt3662_engenius_esr600h.dts b/target/linux/ramips/dts/rt3662_engenius_esr600h.dts index 6770e4cc9a3d..e142fe534743 100644 --- a/target/linux/ramips/dts/rt3662_engenius_esr600h.dts +++ b/target/linux/ramips/dts/rt3662_engenius_esr600h.dts @@ -161,9 +161,9 @@ &pci1 { status = "okay"; - wifi@0,1,0 { + wifi@0,0 { compatible = "pci1814,3091"; - reg = <0x0 1 0 0 0>; + reg = <0x10000 0 0 0 0>; ralink,5ghz = <0>; nvmem-cells = <&eeprom_factory_8000>; nvmem-cell-names = "eeprom"; diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi index 148922e8b9b3..8c76eb663100 100644 --- a/target/linux/ramips/dts/rt3883.dtsi +++ b/target/linux/ramips/dts/rt3883.dtsi @@ -399,7 +399,7 @@ 0x9000 0 0 4 &pciintc 19 >; - pci1: pci@1 { + pci1: pci@1,0 { reg = <0x0800 0 0 0 0>; device_type = "pci"; #interrupt-cells = <1>; @@ -421,6 +421,7 @@ #address-cells = <3>; #size-cells = <2>; + interrupt-controller; status = "disabled"; }; @@ -430,6 +431,7 @@ #address-cells = <3>; #size-cells = <2>; + interrupt-controller; status = "disabled"; }; }; diff --git a/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi b/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi index 4a64d8a7fe29..17c982a3146c 100644 --- a/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi +++ b/target/linux/ramips/dts/rt3883_belkin_f9k110x.dtsi @@ -102,7 +102,7 @@ &pci1 { status = "okay"; - wifi@1,0 { + wifi@0,0 { compatible = "pci1814,3091"; reg = <0x10000 0 0 0 0>; ralink,5ghz = <0>; -- 2.30.2