Unverified Commit 4b46d86c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Arnd Bergmann
Browse files

ARM: dts: aspeed: Fix pca954x i2c-mux node names 



"make dtbs_check":

    arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dtb: i2c-switch@70: $nodename:0: 'i2c-switch@70' does not match '^(i2c-?)?mux'
	    From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
    arm/boot/dts/aspeed-bmc-bytedance-g220a.dtb: i2c-switch@70: Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'i2c@0', 'i2c@1', 'i2c@2', 'i2c@3' were unexpected)
	    From schema: Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.yaml
    ...

Fix this by renaming PCA954x nodes to "i2c-mux", to match the I2C bus
multiplexer/switch DT bindings and the Generic Names Recommendation in
the Devicetree Specification.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 12a26898

arch/arm/boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts

+9 −9
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ &i2c2 { 


&i2c3 {

	status = "okay";

	i2c-switch@70 {

	i2c-mux@70 {

		compatible = "nxp,pca9546";

		reg = <0x70>;

		#address-cells = <1>;
@@ -471,7 +471,7 @@ &i2c5 { 


&i2c6 {

	status = "okay";

	i2c-switch@72 {

	i2c-mux@72 {

		compatible = "nxp,pca9548";

		reg = <0x72>;

		#address-cells = <1>;
@@ -524,7 +524,7 @@ channel_6_7: i2c@7 { 
		};

	};



	i2c-switch@70 {

	i2c-mux@70 {

		compatible = "nxp,pca9546";

		reg = <0x70>;

		#address-cells = <1>;
@@ -533,7 +533,7 @@ channel_6_8: i2c@0 { 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;

			i2c-switch@71 {

			i2c-mux@71 {

				compatible = "nxp,pca9546";

				reg = <0x71>;

				#address-cells = <1>;
@@ -569,7 +569,7 @@ channel_6_9: i2c@1 { 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;

			i2c-switch@71 {

			i2c-mux@71 {

				compatible = "nxp,pca9546";

				reg = <0x71>;

				#address-cells = <1>;
@@ -605,7 +605,7 @@ channel_6_10: i2c@2 { 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;

			i2c-switch@71 {

			i2c-mux@71 {

				compatible = "nxp,pca9546";

				reg = <0x71>;

				#address-cells = <1>;
@@ -640,7 +640,7 @@ channel_6_11: i2c@3 { 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <3>;

			i2c-switch@71 {

			i2c-mux@71 {

				compatible = "nxp,pca9546";

				reg = <0x71>;

				#address-cells = <1>;
@@ -808,7 +808,7 @@ &i2c9 { 


&i2c10 {

	status = "okay";

	i2c-switch@70 {

	i2c-mux@70 {

		compatible = "nxp,pca9546";

		reg = <0x70>;

		#address-cells = <1>;
@@ -838,7 +838,7 @@ channel_10_3: i2c@3 { 
		};

	};



	i2c-switch@71 {

	i2c-mux@71 {

		compatible = "nxp,pca9546";

		reg = <0x71>;

		#address-cells = <1>;

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cloudripper.dts

+5 −5
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ &i2c1 { 
	 * PCA9548 (1-0070) provides 8 channels connecting to SMB (Switch

	 * Main Board).

	 */

	i2c-switch@70 {

	i2c-mux@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -194,7 +194,7 @@ &i2c2 { 
	 * PCA9548 (2-0070) provides 8 channels connecting to SCM (System

	 * Controller Module).

	 */

	i2c-switch@70 {

	i2c-mux@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -256,7 +256,7 @@ &i2c3 { 
	 * PCA9548 (3-0070) provides 8 channels connecting to SMB (Switch

	 * Main Board).

	 */

	i2c-switch@70 {

	i2c-mux@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -423,7 +423,7 @@ &i2c8 { 
	 * PCA9548 (8-0070) provides 8 channels connecting to PDB (Power

	 * Delivery Board).

	 */

	i2c-switch@70 {

	i2c-mux@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -486,7 +486,7 @@ &i2c15 { 
	 * PCA9548 (15-0076) provides 8 channels connecting to FCM (Fan

	 * Controller Module).

	 */

	i2c-switch@76 {

	i2c-mux@76 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cmm.dts

+23 −23
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ &i2c0 { 
&i2c1 {

	status = "okay";



	i2c-switch@77 {

	i2c-mux@77 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -341,7 +341,7 @@ imux16: i2c@0 { 
			#size-cells = <0>;

			reg = <0>;



			i2c-switch@70 {

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -390,7 +390,7 @@ imux111: i2c@7 { 
				};

			};



			i2c-switch@73 {

			i2c-mux@73 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -446,7 +446,7 @@ imux17: i2c@1 { 
			#size-cells = <0>;

			reg = <1>;



			i2c-switch@70 {

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -495,7 +495,7 @@ imux127: i2c@7 { 
				};

			};



			i2c-switch@73 {

			i2c-mux@73 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -551,7 +551,7 @@ imux18: i2c@2 { 
			#size-cells = <0>;

			reg = <2>;



			i2c-switch@70 {

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -600,7 +600,7 @@ imux47: i2c@7 { 
				};

			};



			i2c-switch@73 {

			i2c-mux@73 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -656,7 +656,7 @@ imux19: i2c@3 { 
			#size-cells = <0>;

			reg = <3>;



			i2c-switch@70 {

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -705,7 +705,7 @@ imux63: i2c@7 { 
				};

			};



			i2c-switch@73 {

			i2c-mux@73 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -761,7 +761,7 @@ imux20: i2c@4 { 
			#size-cells = <0>;

			reg = <4>;



			i2c-switch@70 {

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -810,7 +810,7 @@ imux79: i2c@7 { 
				};

			};



			i2c-switch@73 {

			i2c-mux@73 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -866,7 +866,7 @@ imux21: i2c@5 { 
			#size-cells = <0>;

			reg = <5>;



			i2c-switch@70 {

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -915,7 +915,7 @@ imux95: i2c@7 { 
				};

			};



			i2c-switch@73 {

			i2c-mux@73 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -971,7 +971,7 @@ imux22: i2c@6 { 
			#size-cells = <0>;

			reg = <6>;



			i2c-switch@70 {

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1020,7 +1020,7 @@ imux143: i2c@7 { 
				};

			};



			i2c-switch@73 {

			i2c-mux@73 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1076,7 +1076,7 @@ imux23: i2c@7 { 
			#size-cells = <0>;

			reg = <7>;



			i2c-switch@70 {

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1125,7 +1125,7 @@ imux159: i2c@7 { 
				};

			};



			i2c-switch@73 {

			i2c-mux@73 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1183,7 +1183,7 @@ imux167: i2c@7 { 
&i2c2 {

	status = "okay";



	i2c-switch@71 {

	i2c-mux@71 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -1281,7 +1281,7 @@ &i2c7 { 
&i2c8 {

	status = "okay";



	i2c-switch@77 {

	i2c-mux@77 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -1294,7 +1294,7 @@ imux32: i2c@0 { 
			#size-cells = <0>;

			reg = <0>;



			i2c-switch@70 {

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1350,7 +1350,7 @@ imux33: i2c@1 { 
			#size-cells = <0>;

			reg = <1>;



			i2c-switch@70 {

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1406,7 +1406,7 @@ imux34: i2c@2 { 
			#size-cells = <0>;

			reg = <2>;



			i2c-switch@70 {

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1462,7 +1462,7 @@ imux35: i2c@3 { 
			#size-cells = <0>;

			reg = <3>;



			i2c-switch@70 {

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ &kcs3 { 
};



&i2c2 {

	i2c-switch@75 {

	i2c-mux@75 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -123,7 +123,7 @@ imux23: i2c@7 { 
};



&i2c5 {

	i2c-switch@75 {

	i2c-mux@75 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;

arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts

+15 −15
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ &i2c2 { 
	 * PCA9548 (2-0070) provides 8 channels connecting to SCM (System

	 * Controller Module).

	 */

	i2c-switch@70 {

	i2c-mux@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -303,7 +303,7 @@ &i2c8 { 
	 * PCA9548 (8-0070) provides 8 channels connecting to SMB (Switch

	 * Main Board).

	 */

	i2c-switch@70 {

	i2c-mux@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -315,7 +315,7 @@ imux24: i2c@0 { 
			#size-cells = <0>;

			reg = <0>;



			i2c-switch@71 {

			i2c-mux@71 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -481,7 +481,7 @@ imux25: i2c@1 { 
			#size-cells = <0>;

			reg = <1>;



			i2c-switch@72 {

			i2c-mux@72 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -544,7 +544,7 @@ imux26: i2c@2 { 
			#size-cells = <0>;

			reg = <2>;



			i2c-switch@76 {

			i2c-mux@76 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -615,7 +615,7 @@ imux27: i2c@3 { 
			#size-cells = <0>;

			reg = <3>;



			i2c-switch@76 {

			i2c-mux@76 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -715,7 +715,7 @@ &i2c11 { 
	 * PCA9548 (11-0077) provides 8 channels connecting to SMB (Switch

	 * Main Board).

	 */

	i2c-switch@77 {

	i2c-mux@77 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -727,7 +727,7 @@ imux40: i2c@0 { 
			#size-cells = <0>;

			reg = <0>;



			i2c-switch@76 {

			i2c-mux@76 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -790,7 +790,7 @@ imux41: i2c@1 { 
			#size-cells = <0>;

			reg = <1>;



			i2c-switch@76 {

			i2c-mux@76 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -853,7 +853,7 @@ imux42: i2c@2 { 
			#size-cells = <0>;

			reg = <2>;



			i2c-switch@76 {

			i2c-mux@76 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -916,7 +916,7 @@ imux43: i2c@3 { 
			#size-cells = <0>;

			reg = <3>;



			i2c-switch@76 {

			i2c-mux@76 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -979,7 +979,7 @@ imux44: i2c@4 { 
			#size-cells = <0>;

			reg = <4>;



			i2c-switch@76 {

			i2c-mux@76 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1042,7 +1042,7 @@ imux45: i2c@5 { 
			#size-cells = <0>;

			reg = <5>;



			i2c-switch@76 {

			i2c-mux@76 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1105,7 +1105,7 @@ imux46: i2c@6 { 
			#size-cells = <0>;

			reg = <6>;



			i2c-switch@76 {

			i2c-mux@76 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;
@@ -1168,7 +1168,7 @@ imux47: i2c@7 { 
			#size-cells = <0>;

			reg = <7>;



			i2c-switch@76 {

			i2c-mux@76 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;