Browse Source

ramips: fix dtc compiler warnings

The latest dtc compiler considers nodes named i2c or spi as the
respective bus:

  /pinctrl/i2c: incorrect #address-cells for I2C bus
  /pinctrl/spi: incorrect #address-cells for SPI bus

Rename the node to fix the false positives.

Fix the spi node unit address for the DWR-512-B and UBNT-ER-e50 to get
rid of the following warning:

  SPI bus unit address format error, expected "n"

Signed-off-by: Mathias Kresin <[email protected]>
Mathias Kresin 7 years ago
parent
commit
ffa55386f1

+ 1 - 1
target/linux/ramips/dts/DWR-512-B.dts

@@ -115,7 +115,7 @@
 &spi1 {
 	status = "okay";
 
-	spidev@1 {
+	spidev@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "siliconlabs,si3210";

+ 1 - 1
target/linux/ramips/dts/UBNT-ER-e50.dtsi

@@ -91,7 +91,7 @@
 	 */
 	status = "disabled";
 
-	m25p80@0 {
+	m25p80@1 {
 		compatible = "jedec,spi-nor";
 		reg = <1>;
 		spi-max-frequency = <10000000>;

+ 4 - 4
target/linux/ramips/dts/mt7620a.dtsi

@@ -334,8 +334,8 @@
 			};
 		};
 
-		spi_pins: spi {
-			spi {
+		spi_pins: spi_pins {
+			spi_pins {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
@@ -348,8 +348,8 @@
 			};
 		};
 
-		i2c_pins: i2c {
-			i2c {
+		i2c_pins: i2c_pins {
+			i2c_pins {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};

+ 4 - 4
target/linux/ramips/dts/mt7620n.dtsi

@@ -255,8 +255,8 @@
 			};
 		};
 
-		spi_pins: spi {
-			spi {
+		spi_pins: spi_pins {
+			spi_pins {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
@@ -269,8 +269,8 @@
 			};
 		};
 
-		i2c_pins: i2c {
-			i2c {
+		i2c_pins: i2c_pins {
+			i2c_pins {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};

+ 4 - 4
target/linux/ramips/dts/mt7621.dtsi

@@ -239,15 +239,15 @@
 		state_default: pinctrl0 {
 		};
 
-		i2c_pins: i2c {
-			i2c {
+		i2c_pins: i2c_pins {
+			i2c_pins {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
-		spi_pins: spi {
-			spi {
+		spi_pins: spi_pins {
+			spi_pins {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};

+ 4 - 4
target/linux/ramips/dts/mt7628an.dtsi

@@ -281,8 +281,8 @@
 		state_default: pinctrl0 {
 		};
 
-		spi_pins: spi {
-			spi {
+		spi_pins: spi_pins {
+			spi_pins {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
@@ -295,8 +295,8 @@
 			};
 		};
 
-		i2c_pins: i2c {
-			i2c {
+		i2c_pins: i2c_pins {
+			i2c_pins {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};

+ 4 - 4
target/linux/ramips/dts/rt2880.dtsi

@@ -158,15 +158,15 @@
 			};
 		};
 
-		i2c_pins: i2c {
-			i2c {
+		i2c_pins: i2c_pins {
+			i2c_pins {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
-		spi_pins: spi {
-			spi {
+		spi_pins: spi_pins {
+			spi_pins {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};

+ 4 - 4
target/linux/ramips/dts/rt3050.dtsi

@@ -250,15 +250,15 @@
 			};
 		};
 
-		i2c_pins: i2c {
-			i2c {
+		i2c_pins: i2c_pins {
+			i2c_pins {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
-		spi_pins: spi {
-			spi {
+		spi_pins: spi_pins {
+			spi_pins {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};

+ 4 - 4
target/linux/ramips/dts/rt3352.dtsi

@@ -259,8 +259,8 @@
 		state_default: pinctrl0 {
 		};
 
-		i2c_pins: i2c {
-			i2c {
+		i2c_pins: i2c_pins {
+			i2c_pins {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
@@ -280,8 +280,8 @@
 			};
 		};
 
-		spi_pins: spi {
-			spi {
+		spi_pins: spi_pins {
+			spi_pins {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};

+ 4 - 4
target/linux/ramips/dts/rt3883.dtsi

@@ -279,15 +279,15 @@
 		state_default: pinctrl0 {
 		};
 
-		i2c_pins: i2c {
-			i2c {
+		i2c_pins: i2c_pins {
+			i2c_pins {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
-		spi_pins: spi {
-			spi {
+		spi_pins: spi_pins {
+			spi_pins {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};

+ 4 - 4
target/linux/ramips/dts/rt5350.dtsi

@@ -273,15 +273,15 @@
 		state_default: pinctrl0 {
 		};
 
-		i2c_pins: i2c {
-			i2c {
+		i2c_pins: i2c_pins {
+			i2c_pins {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
-		spi_pins: spi {
-			spi {
+		spi_pins: spi_pins {
+			spi_pins {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};