Skip to content

Commit a24cd2f

Browse files
committed
ARM: dts: s5pv210: Align i2c-gpio node names with dtschema
New dtschema v2025.6 enforces different naming on I2C nodes thus new dtbs_check warnings appeared for I2C GPIO nodes: s5pv210-fascinate4g.dtb: i2c-gpio-0 (i2c-gpio): $nodename:0: 'i2c-gpio-0' does not match '^i2c(@.+|-[a-z0-9]+)?$' s5pv210-fascinate4g.dtb: i2c-gpio-0 (i2c-gpio): Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'audio-codec@1a' were unexpected) Rename the nodes to a generic i2c-[0-9]+ style with numbers continuing the SoC I2C controller indexing (3 controllers) for simplicity and obviousness, even if the SoC I2C controller is not enabled on given board. The names anyway would not conflict with SoC ones because of unit addresses. Verified with comparing two fdt (after fdtdump). Reported-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Closes: https://lore.kernel.org/all/aCtD7BH5N_uPGkq7@shikoro/ Link: https://lore.kernel.org/r/20250612094807.62532-4-krzysztof.kozlowski@linaro.org Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
1 parent a0c7a6b commit a24cd2f

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

arch/arm/boot/dts/samsung/s5pv210-aquila.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
regulator-max-microvolt = <3700000>;
6363
};
6464

65-
i2c_pmic: i2c-pmic {
65+
i2c_pmic: i2c-3 {
6666
compatible = "i2c-gpio";
6767
sda-gpios = <&gpj4 0 GPIO_ACTIVE_HIGH>;
6868
scl-gpios = <&gpj4 3 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/samsung/s5pv210-aries.dtsi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
power-off-delay-us = <500>;
103103
};
104104

105-
i2c_sound: i2c-gpio-0 {
105+
i2c_sound: i2c-3 {
106106
compatible = "i2c-gpio";
107107
sda-gpios = <&mp05 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
108108
scl-gpios = <&mp05 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -150,7 +150,7 @@
150150
};
151151
};
152152

153-
i2c_accel: i2c-gpio-1 {
153+
i2c_accel: i2c-4 {
154154
compatible = "i2c-gpio";
155155
sda-gpios = <&gpj3 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
156156
scl-gpios = <&gpj3 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -170,7 +170,7 @@
170170
};
171171
};
172172

173-
i2c_pmic: i2c-gpio-2 {
173+
i2c_pmic: i2c-5 {
174174
compatible = "i2c-gpio";
175175
sda-gpios = <&gpj4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
176176
scl-gpios = <&gpj4 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -420,7 +420,7 @@
420420
};
421421
};
422422

423-
i2c_musb: i2c-gpio-3 {
423+
i2c_musb: i2c-6 {
424424
compatible = "i2c-gpio";
425425
sda-gpios = <&gpj3 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
426426
scl-gpios = <&gpj3 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -442,7 +442,7 @@
442442
};
443443
};
444444

445-
i2c_fuel: i2c-gpio-4 {
445+
i2c_fuel: i2c-7 {
446446
compatible = "i2c-gpio";
447447
sda-gpios = <&mp05 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
448448
scl-gpios = <&mp05 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -459,7 +459,7 @@
459459
};
460460
};
461461

462-
i2c_touchkey: i2c-gpio-5 {
462+
i2c_touchkey: i2c-8 {
463463
compatible = "i2c-gpio";
464464
sda-gpios = <&gpj3 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
465465
scl-gpios = <&gpj3 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -485,7 +485,7 @@
485485
};
486486
};
487487

488-
i2c_prox: i2c-gpio-6 {
488+
i2c_prox: i2c-9 {
489489
compatible = "i2c-gpio";
490490
sda-gpios = <&gpg2 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
491491
scl-gpios = <&gpg0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -513,7 +513,7 @@
513513
};
514514
};
515515

516-
i2c_magnetometer: i2c-gpio-7 {
516+
i2c_magnetometer: i2c-10 {
517517
compatible = "i2c-gpio";
518518
sda-gpios = <&gpj0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
519519
scl-gpios = <&gpj0 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

arch/arm/boot/dts/samsung/s5pv210-galaxys.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
};
5252
};
5353

54-
i2c_fmradio: i2c-gpio-8 {
54+
i2c_fmradio: i2c-11 {
5555
compatible = "i2c-gpio";
5656
sda-gpios = <&gpd1 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
5757
scl-gpios = <&gpd1 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

arch/arm/boot/dts/samsung/s5pv210-goni.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
enable-active-high;
7575
};
7676

77-
i2c_pmic: i2c-pmic {
77+
i2c_pmic: i2c-3 {
7878
compatible = "i2c-gpio";
7979
sda-gpios = <&gpj4 0 GPIO_ACTIVE_HIGH>;
8080
scl-gpios = <&gpj4 3 GPIO_ACTIVE_HIGH>;

0 commit comments

Comments
 (0)