Skip to content

Commit 4b46d86

Browse files
geertuarndb
geertu
authored and
arndb
committed
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: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 12a2689 commit 4b46d86

23 files changed

Lines changed: 136 additions & 136 deletions

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@
424424

425425
&i2c3 {
426426
status = "okay";
427-
i2c-switch@70 {
427+
i2c-mux@70 {
428428
compatible = "nxp,pca9546";
429429
reg = <0x70>;
430430
#address-cells = <1>;
@@ -471,7 +471,7 @@
471471

472472
&i2c6 {
473473
status = "okay";
474-
i2c-switch@72 {
474+
i2c-mux@72 {
475475
compatible = "nxp,pca9548";
476476
reg = <0x72>;
477477
#address-cells = <1>;
@@ -524,7 +524,7 @@
524524
};
525525
};
526526

527-
i2c-switch@70 {
527+
i2c-mux@70 {
528528
compatible = "nxp,pca9546";
529529
reg = <0x70>;
530530
#address-cells = <1>;
@@ -533,7 +533,7 @@
533533
#address-cells = <1>;
534534
#size-cells = <0>;
535535
reg = <0>;
536-
i2c-switch@71 {
536+
i2c-mux@71 {
537537
compatible = "nxp,pca9546";
538538
reg = <0x71>;
539539
#address-cells = <1>;
@@ -569,7 +569,7 @@
569569
#address-cells = <1>;
570570
#size-cells = <0>;
571571
reg = <1>;
572-
i2c-switch@71 {
572+
i2c-mux@71 {
573573
compatible = "nxp,pca9546";
574574
reg = <0x71>;
575575
#address-cells = <1>;
@@ -605,7 +605,7 @@
605605
#address-cells = <1>;
606606
#size-cells = <0>;
607607
reg = <2>;
608-
i2c-switch@71 {
608+
i2c-mux@71 {
609609
compatible = "nxp,pca9546";
610610
reg = <0x71>;
611611
#address-cells = <1>;
@@ -640,7 +640,7 @@
640640
#address-cells = <1>;
641641
#size-cells = <0>;
642642
reg = <3>;
643-
i2c-switch@71 {
643+
i2c-mux@71 {
644644
compatible = "nxp,pca9546";
645645
reg = <0x71>;
646646
#address-cells = <1>;
@@ -808,7 +808,7 @@
808808

809809
&i2c10 {
810810
status = "okay";
811-
i2c-switch@70 {
811+
i2c-mux@70 {
812812
compatible = "nxp,pca9546";
813813
reg = <0x70>;
814814
#address-cells = <1>;
@@ -838,7 +838,7 @@
838838
};
839839
};
840840

841-
i2c-switch@71 {
841+
i2c-mux@71 {
842842
compatible = "nxp,pca9546";
843843
reg = <0x71>;
844844
#address-cells = <1>;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
* PCA9548 (1-0070) provides 8 channels connecting to SMB (Switch
133133
* Main Board).
134134
*/
135-
i2c-switch@70 {
135+
i2c-mux@70 {
136136
compatible = "nxp,pca9548";
137137
#address-cells = <1>;
138138
#size-cells = <0>;
@@ -194,7 +194,7 @@
194194
* PCA9548 (2-0070) provides 8 channels connecting to SCM (System
195195
* Controller Module).
196196
*/
197-
i2c-switch@70 {
197+
i2c-mux@70 {
198198
compatible = "nxp,pca9548";
199199
#address-cells = <1>;
200200
#size-cells = <0>;
@@ -256,7 +256,7 @@
256256
* PCA9548 (3-0070) provides 8 channels connecting to SMB (Switch
257257
* Main Board).
258258
*/
259-
i2c-switch@70 {
259+
i2c-mux@70 {
260260
compatible = "nxp,pca9548";
261261
#address-cells = <1>;
262262
#size-cells = <0>;
@@ -423,7 +423,7 @@
423423
* PCA9548 (8-0070) provides 8 channels connecting to PDB (Power
424424
* Delivery Board).
425425
*/
426-
i2c-switch@70 {
426+
i2c-mux@70 {
427427
compatible = "nxp,pca9548";
428428
#address-cells = <1>;
429429
#size-cells = <0>;
@@ -486,7 +486,7 @@
486486
* PCA9548 (15-0076) provides 8 channels connecting to FCM (Fan
487487
* Controller Module).
488488
*/
489-
i2c-switch@76 {
489+
i2c-mux@76 {
490490
compatible = "nxp,pca9548";
491491
#address-cells = <1>;
492492
#size-cells = <0>;

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
328328
&i2c1 {
329329
status = "okay";
330330

331-
i2c-switch@77 {
331+
i2c-mux@77 {
332332
compatible = "nxp,pca9548";
333333
#address-cells = <1>;
334334
#size-cells = <0>;
@@ -341,7 +341,7 @@
341341
#size-cells = <0>;
342342
reg = <0>;
343343

344-
i2c-switch@70 {
344+
i2c-mux@70 {
345345
compatible = "nxp,pca9548";
346346
#address-cells = <1>;
347347
#size-cells = <0>;
@@ -390,7 +390,7 @@
390390
};
391391
};
392392

393-
i2c-switch@73 {
393+
i2c-mux@73 {
394394
compatible = "nxp,pca9548";
395395
#address-cells = <1>;
396396
#size-cells = <0>;
@@ -446,7 +446,7 @@
446446
#size-cells = <0>;
447447
reg = <1>;
448448

449-
i2c-switch@70 {
449+
i2c-mux@70 {
450450
compatible = "nxp,pca9548";
451451
#address-cells = <1>;
452452
#size-cells = <0>;
@@ -495,7 +495,7 @@
495495
};
496496
};
497497

498-
i2c-switch@73 {
498+
i2c-mux@73 {
499499
compatible = "nxp,pca9548";
500500
#address-cells = <1>;
501501
#size-cells = <0>;
@@ -551,7 +551,7 @@
551551
#size-cells = <0>;
552552
reg = <2>;
553553

554-
i2c-switch@70 {
554+
i2c-mux@70 {
555555
compatible = "nxp,pca9548";
556556
#address-cells = <1>;
557557
#size-cells = <0>;
@@ -600,7 +600,7 @@
600600
};
601601
};
602602

603-
i2c-switch@73 {
603+
i2c-mux@73 {
604604
compatible = "nxp,pca9548";
605605
#address-cells = <1>;
606606
#size-cells = <0>;
@@ -656,7 +656,7 @@
656656
#size-cells = <0>;
657657
reg = <3>;
658658

659-
i2c-switch@70 {
659+
i2c-mux@70 {
660660
compatible = "nxp,pca9548";
661661
#address-cells = <1>;
662662
#size-cells = <0>;
@@ -705,7 +705,7 @@
705705
};
706706
};
707707

708-
i2c-switch@73 {
708+
i2c-mux@73 {
709709
compatible = "nxp,pca9548";
710710
#address-cells = <1>;
711711
#size-cells = <0>;
@@ -761,7 +761,7 @@
761761
#size-cells = <0>;
762762
reg = <4>;
763763

764-
i2c-switch@70 {
764+
i2c-mux@70 {
765765
compatible = "nxp,pca9548";
766766
#address-cells = <1>;
767767
#size-cells = <0>;
@@ -810,7 +810,7 @@
810810
};
811811
};
812812

813-
i2c-switch@73 {
813+
i2c-mux@73 {
814814
compatible = "nxp,pca9548";
815815
#address-cells = <1>;
816816
#size-cells = <0>;
@@ -866,7 +866,7 @@
866866
#size-cells = <0>;
867867
reg = <5>;
868868

869-
i2c-switch@70 {
869+
i2c-mux@70 {
870870
compatible = "nxp,pca9548";
871871
#address-cells = <1>;
872872
#size-cells = <0>;
@@ -915,7 +915,7 @@
915915
};
916916
};
917917

918-
i2c-switch@73 {
918+
i2c-mux@73 {
919919
compatible = "nxp,pca9548";
920920
#address-cells = <1>;
921921
#size-cells = <0>;
@@ -971,7 +971,7 @@
971971
#size-cells = <0>;
972972
reg = <6>;
973973

974-
i2c-switch@70 {
974+
i2c-mux@70 {
975975
compatible = "nxp,pca9548";
976976
#address-cells = <1>;
977977
#size-cells = <0>;
@@ -1020,7 +1020,7 @@
10201020
};
10211021
};
10221022

1023-
i2c-switch@73 {
1023+
i2c-mux@73 {
10241024
compatible = "nxp,pca9548";
10251025
#address-cells = <1>;
10261026
#size-cells = <0>;
@@ -1076,7 +1076,7 @@
10761076
#size-cells = <0>;
10771077
reg = <7>;
10781078

1079-
i2c-switch@70 {
1079+
i2c-mux@70 {
10801080
compatible = "nxp,pca9548";
10811081
#address-cells = <1>;
10821082
#size-cells = <0>;
@@ -1125,7 +1125,7 @@
11251125
};
11261126
};
11271127

1128-
i2c-switch@73 {
1128+
i2c-mux@73 {
11291129
compatible = "nxp,pca9548";
11301130
#address-cells = <1>;
11311131
#size-cells = <0>;
@@ -1183,7 +1183,7 @@
11831183
&i2c2 {
11841184
status = "okay";
11851185

1186-
i2c-switch@71 {
1186+
i2c-mux@71 {
11871187
compatible = "nxp,pca9548";
11881188
#address-cells = <1>;
11891189
#size-cells = <0>;
@@ -1281,7 +1281,7 @@
12811281
&i2c8 {
12821282
status = "okay";
12831283

1284-
i2c-switch@77 {
1284+
i2c-mux@77 {
12851285
compatible = "nxp,pca9548";
12861286
#address-cells = <1>;
12871287
#size-cells = <0>;
@@ -1294,7 +1294,7 @@
12941294
#size-cells = <0>;
12951295
reg = <0>;
12961296

1297-
i2c-switch@70 {
1297+
i2c-mux@70 {
12981298
compatible = "nxp,pca9548";
12991299
#address-cells = <1>;
13001300
#size-cells = <0>;
@@ -1350,7 +1350,7 @@
13501350
#size-cells = <0>;
13511351
reg = <1>;
13521352

1353-
i2c-switch@70 {
1353+
i2c-mux@70 {
13541354
compatible = "nxp,pca9548";
13551355
#address-cells = <1>;
13561356
#size-cells = <0>;
@@ -1406,7 +1406,7 @@
14061406
#size-cells = <0>;
14071407
reg = <2>;
14081408

1409-
i2c-switch@70 {
1409+
i2c-mux@70 {
14101410
compatible = "nxp,pca9548";
14111411
#address-cells = <1>;
14121412
#size-cells = <0>;
@@ -1462,7 +1462,7 @@
14621462
#size-cells = <0>;
14631463
reg = <3>;
14641464

1465-
i2c-switch@70 {
1465+
i2c-mux@70 {
14661466
compatible = "nxp,pca9548";
14671467
#address-cells = <1>;
14681468
#size-cells = <0>;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
};
6666

6767
&i2c2 {
68-
i2c-switch@75 {
68+
i2c-mux@75 {
6969
compatible = "nxp,pca9548";
7070
#address-cells = <1>;
7171
#size-cells = <0>;
@@ -123,7 +123,7 @@
123123
};
124124

125125
&i2c5 {
126-
i2c-switch@75 {
126+
i2c-mux@75 {
127127
compatible = "nxp,pca9548";
128128
#address-cells = <1>;
129129
#size-cells = <0>;

0 commit comments

Comments
 (0)