ARM: dts: exynos: 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:

  exynos4212-tab3-lte8.dtb: i2c-gpio-3 (i2c-gpio):
    $nodename:0: 'i2c-gpio-3' does not match '^i2c(@.+|-[a-z0-9]+)?$'
  exynos4212-tab3-lte8.dtb: i2c-gpio-3 (i2c-gpio):
    Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'magnetometer@2e' were unexpected)

Rename the nodes to a generic i2c-[0-9]+ style with numbers continuing
the SoC I2C controller indexing (Exynos3250: 8 controllers, Exynos4: 9
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-3-krzysztof.kozlowski@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

diff --git a/arch/arm/boot/dts/samsung/exynos3250-monk.dts b/arch/arm/boot/dts/samsung/exynos3250-monk.dts
index 2de877d4ccc5c8029035e76195977d2e1e7d0553..68236c7297d7cf36a553067b930283e9eee1ede5 100644 (file)
--- a/arch/arm/boot/dts/samsung/exynos3250-monk.dts
+++ b/arch/arm/boot/dts/samsung/exynos3250-monk.dts
@@ -56,7 +56,7 @@
                enable-active-high;
        };
 
-       i2c_max77836: i2c-gpio-0 {
+       i2c_max77836: i2c-8 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpd0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpd0 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

diff --git a/arch/arm/boot/dts/samsung/exynos3250-rinato.dts b/arch/arm/boot/dts/samsung/exynos3250-rinato.dts
index 88fb3e68ff029197b3eaeb18a69f63b174da617f..36d2171c1ce86a5b912b6e5b7fac7cd214a658e7 100644 (file)
--- a/arch/arm/boot/dts/samsung/exynos3250-rinato.dts
+++ b/arch/arm/boot/dts/samsung/exynos3250-rinato.dts
@@ -58,7 +58,7 @@
                reset-gpios = <&gpe0 4 GPIO_ACTIVE_LOW>;
        };
 
-       i2c_max77836: i2c-gpio-0 {
+       i2c_max77836: i2c-8 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpd0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpd0 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

diff --git a/arch/arm/boot/dts/samsung/exynos4210-i9100.dts b/arch/arm/boot/dts/samsung/exynos4210-i9100.dts
index 0d8495792a70215631a2c1de0e8517b0396ee560..df229fb8a16bebb3dbae026d18a98a4e2ca50875 100644 (file)
--- a/arch/arm/boot/dts/samsung/exynos4210-i9100.dts
+++ b/arch/arm/boot/dts/samsung/exynos4210-i9100.dts
@@ -130,7 +130,7 @@
                reset-gpios = <&gpl1 2 GPIO_ACTIVE_LOW>;
        };
 
-       i2c_max17042_fuel: i2c-gpio-0 {
+       i2c_max17042_fuel: i2c-9 {
                compatible = "i2c-gpio";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -154,7 +154,7 @@
                };
        };
 
-       i2c_s5k5baf: i2c-gpio-1 {
+       i2c_s5k5baf: i2c-10 {
                compatible = "i2c-gpio";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -184,7 +184,7 @@
                };
        };
 
-       i2c-gpio-2 {
+       i2c-11 {
                compatible = "i2c-gpio";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
index 70e3091062f940b3fee58aa8a5aaa4a0dbbe1cc7..12b7f252b24da213c2682d8d3f55eac92af73d2b 100644 (file)
--- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi
@@ -123,7 +123,7 @@
                color = <LED_COLOR_ID_WHITE>;
        };
 
-       i2c_max77693: i2c-gpio-1 {
+       i2c_max77693: i2c-9 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpm2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpm2 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -169,7 +169,7 @@
                };
        };
 
-       i2c_max77693_fuel: i2c-gpio-2 {
+       i2c_max77693_fuel: i2c-10 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpy0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpy0 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -190,7 +190,7 @@
                };
        };
 
-       i2c_magnetometer: i2c-gpio-3 {
+       i2c_magnetometer: i2c-11 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpy2 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpy2 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -208,7 +208,7 @@
                };
        };
 
-       i2c_lightsensor: i2c-gpio-4 {
+       i2c_lightsensor: i2c-12 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpl0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpl0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -220,7 +220,7 @@
                /* WiFi model uses CM3323, 3G/LTE use CM36653 */
        };
 
-       i2c_bl: i2c-gpio-5 {
+       i2c_bl: i2c-13 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpm4 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpm4 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

diff --git a/arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi
index 54e1a57ae886b4c02ce3e9fdce96012b5f57c3ab..3248be990059b0b60ff7ef12c4544022d5c488bc 100644 (file)
--- a/arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi
@@ -53,7 +53,7 @@
                enable-active-high;
        };
 
-       i2c_ak8975: i2c-gpio-0 {
+       i2c_ak8975: i2c-13 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpy2 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpy2 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -68,7 +68,7 @@
                };
        };
 
-       i2c_cm36651: i2c-gpio-2 {
+       i2c_cm36651: i2c-14 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpf0 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpf0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

diff --git a/arch/arm/boot/dts/samsung/exynos4412-midas.dtsi b/arch/arm/boot/dts/samsung/exynos4412-midas.dtsi
index 3d5aace668dc5a84f6be42ad87d9a3b244c21b00..05ddddb565ee365049445a4f745e468ec8cc3fe5 100644 (file)
--- a/arch/arm/boot/dts/samsung/exynos4412-midas.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos4412-midas.dtsi
@@ -166,7 +166,7 @@
                };
        };
 
-       i2c_max77693: i2c-gpio-1 {
+       i2c_max77693: i2c-9 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpm2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpm2 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -246,7 +246,7 @@
                };
        };
 
-       i2c_max77693_fuel: i2c-gpio-3 {
+       i2c_max77693_fuel: i2c-10 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpf1 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpf1 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -267,7 +267,7 @@
                };
        };
 
-       i2c-gpio-4 {
+       i2c-11 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpl0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpl0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -286,7 +286,7 @@
                };
        };
 
-       i2c-mhl {
+       i2c-12 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpf0 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpf0 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

diff --git a/arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi b/arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi
index 28a6058027335e6af91e55bda8292e83a87a33aa..8d52aa13b862f18cb8db5a535bb270cfd65aa0dd 100644 (file)
--- a/arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi
+++ b/arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi
@@ -140,7 +140,7 @@
                constant-charge-voltage-max-microvolt = <4200000>;
        };
 
-       i2c-gpio-1 {
+       i2c-9 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpy2 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpy2 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -158,7 +158,7 @@
                };
        };
 
-       i2c-gpio-2 {
+       i2c-10 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpy0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpy0 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -179,7 +179,7 @@
                };
        };
 
-       i2c-gpio-3 {
+       i2c-11 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpm4 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpm4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -207,7 +207,7 @@
                };
        };
 
-       i2c-gpio-4 {
+       i2c-12 {
                compatible = "i2c-gpio";
                sda-gpios = <&gpm2 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                scl-gpios = <&gpm2 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;