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>

diff --git a/arch/arm/boot/dts/samsung/s5pv210-aquila.dts b/arch/arm/boot/dts/samsung/s5pv210-aquila.dts
index 0f5c6cd0f3a11478b6ecefdd0ab6fe15b8c8faa1..e9ec2cc718e04dd9e3261c69d6bc81a5adb7bdd5 100644 (file)
--- a/arch/arm/boot/dts/samsung/s5pv210-aquila.dts
+++ b/arch/arm/boot/dts/samsung/s5pv210-aquila.dts
@@ -62,7 +62,7 @@
                regulator-max-microvolt = <3700000>;
        };
 
-       i2c_pmic: i2c-pmic {
+       i2c_pmic: i2c-3 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpj4 0 GPIO_ACTIVE_HIGH>;
                scl-gpios = <&gpj4 3 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/samsung/s5pv210-aries.dtsi b/arch/arm/boot/dts/samsung/s5pv210-aries.dtsi
index 153514e80c9a14ab1fdc69fb11fc09b8a6c333b4..0a1a35f4f7cc49950469bfbe8f1b2d01c42686f1 100644 (file)
--- a/arch/arm/boot/dts/samsung/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/samsung/s5pv210-aries.dtsi
@@ -102,7 +102,7 @@
                power-off-delay-us = <500>;
        };
 
-       i2c_sound: i2c-gpio-0 {
+       i2c_sound: i2c-3 {
                compatible = "i2c-gpio";
                sda-gpios = <&mp05 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&mp05 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -150,7 +150,7 @@
                };
        };
 
-       i2c_accel: i2c-gpio-1 {
+       i2c_accel: i2c-4 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpj3 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpj3 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -170,7 +170,7 @@
                };
        };
 
-       i2c_pmic: i2c-gpio-2 {
+       i2c_pmic: i2c-5 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpj4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpj4 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -420,7 +420,7 @@
                };
        };
 
-       i2c_musb: i2c-gpio-3 {
+       i2c_musb: i2c-6 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpj3 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpj3 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -442,7 +442,7 @@
                };
        };
 
-       i2c_fuel: i2c-gpio-4 {
+       i2c_fuel: i2c-7 {
                compatible = "i2c-gpio";
                sda-gpios = <&mp05 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&mp05 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -459,7 +459,7 @@
                };
        };
 
-       i2c_touchkey: i2c-gpio-5 {
+       i2c_touchkey: i2c-8 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpj3 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpj3 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -485,7 +485,7 @@
                };
        };
 
-       i2c_prox: i2c-gpio-6 {
+       i2c_prox: i2c-9 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpg2 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpg0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -513,7 +513,7 @@
                };
        };
 
-       i2c_magnetometer: i2c-gpio-7 {
+       i2c_magnetometer: i2c-10 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpj0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpj0 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

diff --git a/arch/arm/boot/dts/samsung/s5pv210-galaxys.dts b/arch/arm/boot/dts/samsung/s5pv210-galaxys.dts
index 8792944123815ea42c9cdd47feb2490b5081eb08..5863a1300cc1dba05b006b78b80f471517bd4f5d 100644 (file)
--- a/arch/arm/boot/dts/samsung/s5pv210-galaxys.dts
+++ b/arch/arm/boot/dts/samsung/s5pv210-galaxys.dts
@@ -51,7 +51,7 @@
                };
        };
 
-       i2c_fmradio: i2c-gpio-8 {
+       i2c_fmradio: i2c-11 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpd1 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpd1 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

diff --git a/arch/arm/boot/dts/samsung/s5pv210-goni.dts b/arch/arm/boot/dts/samsung/s5pv210-goni.dts
index d32f42dd1bf56efc9d24d3ca7f1e41219472ae34..079581f4dfec3e832a2c4875eec13fb73cbf9123 100644 (file)
--- a/arch/arm/boot/dts/samsung/s5pv210-goni.dts
+++ b/arch/arm/boot/dts/samsung/s5pv210-goni.dts
@@ -74,7 +74,7 @@
                enable-active-high;
        };
 
-       i2c_pmic: i2c-pmic {
+       i2c_pmic: i2c-3 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpj4 0 GPIO_ACTIVE_HIGH>;
                scl-gpios = <&gpj4 3 GPIO_ACTIVE_HIGH>;