ramips: fix dtc warnings

Mostly leading 0 removals and wrong addresses. Signed-off-by: Rosen Penev <rosenp@gmail.com>
neheb · Nov 30, 2023 · af1d5d3 · af1d5d3
1 parent b87f849
commit af1d5d3
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 15 deletions.
diff --git 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 {
-		compatible = "pci1814,3091";
-		reg = <0x0 1 0 0 0>;
+	wifi@0,0 {
+		compatible = "pci1814,5592";
+		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
@@ -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
@@ -129,7 +129,7 @@
 					#address-cells = <1>;
 					#size-cells = <1>;
 
-					macaddr_factory_0004: macaddr@0004 {
+					macaddr_factory_0004: macaddr@4 {
 						reg = <0x0004 0x6>;
 					};
 

diff --git 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
@@ -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
@@ -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
@@ -408,7 +408,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>;
@@ -430,6 +430,7 @@
 				#address-cells = <3>;
 				#size-cells = <2>;
 
+				interrupt-controller;
 				status = "disabled";
 			};
 
@@ -439,6 +440,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
@@ -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>;