[PATCH 5/7] ARM: dts: stm32: use proper node names for GPIO based I2C busses

Wolfram Sang
2025-05-19T12:15:34Z

There shall not be a '-' before the number.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
.../boot/dts/st/ste-ux500-samsung-codina-tmo.dts | 8 ++++----
.../arm/boot/dts/st/ste-ux500-samsung-codina.dts | 8 ++++----
.../arm/boot/dts/st/ste-ux500-samsung-gavini.dts | 12 ++++++------
.../arm/boot/dts/st/ste-ux500-samsung-golden.dts | 8 ++++----
.../arm/boot/dts/st/ste-ux500-samsung-janice.dts | 16 ++++++++--------
arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts | 8 ++++----
.../arm/boot/dts/st/ste-ux500-samsung-skomer.dts | 8 ++++----
7 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts
index 404d4ea9347b..7e6be26549ef 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-codina-tmo.dts
@@ -215,7 +215,7 @@ led {
};

/* Bit-banged I2C on GPIO143 and GPIO144 also called "SUBPMU I2C" */
- i2c-gpio-0 {
+ i2c-gpio0 {
compatible = "i2c-gpio";
sda-gpios = <&gpio4 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 15 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -228,7 +228,7 @@ i2c-gpio-0 {
};

/* Bit-banged I2C on GPIO151 and GPIO152 also called "COMP I2C" */
- i2c-gpio-1 {
+ i2c-gpio1 {
compatible = "i2c-gpio";
sda-gpios = <&gpio4 24 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 23 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -690,7 +690,7 @@ codina_cfg1 {
};
};
/* GPIO-based I2C bus for subpmu */
- i2c-gpio-0 {
+ i2c-gpio0 {
i2c_gpio_0_default: i2c_gpio_0 {
codina_cfg1 {
pins = "GPIO143_D12", "GPIO144_B13";
@@ -699,7 +699,7 @@ codina_cfg1 {
};
};
/* GPIO-based I2C bus for the NFC */
- i2c-gpio-1 {
+ i2c-gpio1 {
i2c_gpio_1_default: i2c_gpio_1 {
codina_cfg1 {
pins = "GPIO151_D17", "GPIO152_D16";
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts
index 40b0d92dfb15..6706c31ff1a5 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts
@@ -285,7 +285,7 @@ led {
};

/* Bit-banged I2C on GPIO143 and GPIO144 also called "SUBPMU I2C" */
- i2c-gpio-0 {
+ i2c-gpio0 {
compatible = "i2c-gpio";
sda-gpios = <&gpio4 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 15 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -306,7 +306,7 @@ magnetometer@c {
};

/* Bit-banged I2C on GPIO151 and GPIO152 also called "NFC I2C" */
- i2c-gpio-1 {
+ i2c-gpio1 {
compatible = "i2c-gpio";
sda-gpios = <&gpio4 24 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 23 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -816,7 +816,7 @@ codina_cfg1 {
};
};
/* GPIO-based I2C bus for subpmu */
- i2c-gpio-0 {
+ i2c-gpio0 {
i2c_gpio_0_default: i2c_gpio_0 {
codina_cfg1 {
pins = "GPIO143_D12", "GPIO144_B13";
@@ -825,7 +825,7 @@ codina_cfg1 {
};
};
/* GPIO-based I2C bus for the NFC */
- i2c-gpio-1 {
+ i2c-gpio1 {
i2c_gpio_1_default: i2c_gpio_1 {
codina_cfg1 {
pins = "GPIO151_D17", "GPIO152_D16";
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-gavini.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-gavini.dts
index ad9a20ccaaeb..f9423f168f62 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-gavini.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-gavini.dts
@@ -249,7 +249,7 @@ ktd259: backlight {
};

/* Bit-banged I2C on GPIO143 and GPIO144 also called "SUBPMU I2C" */
- i2c-gpio-0 {
+ i2c-gpio0 {
compatible = "i2c-gpio";
sda-gpios = <&gpio4 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 15 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -321,7 +321,7 @@ panel_in: endpoint {
};

/* Bit-banged I2C on GPIO201 and GPIO202 also called "MOT_I2C" */
- i2c-gpio-2 {
+ i2c-gpio2 {
compatible = "i2c-gpio";
sda-gpios = <&gpio6 10 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio6 9 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -333,7 +333,7 @@ i2c-gpio-2 {
};

/* Bit-banged I2C on GPIO196 and GPIO197 also called "MPR_I2C" */
- i2c-gpio-3 {
+ i2c-gpio3 {
compatible = "i2c-gpio";
sda-gpios = <&gpio6 5 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio6 4 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -796,7 +796,7 @@ gavini_cfg1 {
};
};
/* GPIO-based I2C bus for magnetometer and NCP6914 */
- i2c-gpio-0 {
+ i2c-gpio0 {
i2c_gpio_0_default: i2c_gpio_0 {
gavini_cfg1 {
pins = "GPIO143_D12", "GPIO144_B13";
@@ -805,7 +805,7 @@ gavini_cfg1 {
};
};
/* GPIO-based I2C bus for the Immersion ISA1200 */
- i2c-gpio-2 {
+ i2c-gpio2 {
i2c_gpio_2_default: i2c_gpio_2 {
gavini_cfg1 {
pins = "GPIO201_AF24", "GPIO202_AF25";
@@ -814,7 +814,7 @@ gavini_cfg1 {
};
};
/* GPIO-based I2C bus for the TI DPP2601 */
- i2c-gpio-3 {
+ i2c-gpio3 {
i2c_gpio_3_default: i2c_gpio_3 {
gavini_cfg1 {
pins = "GPIO196_AG26", "GPIO197_AH24";
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-golden.dts
index f736888474e7..fad867964a50 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-golden.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-golden.dts
@@ -55,7 +55,7 @@ bat_therm: thermistor {
#thermal-sensor-cells = <0>;
};

- i2c-gpio-0 {
+ i2c-gpio0 {
compatible = "i2c-gpio";
sda-gpios = <&gpio2 14 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio2 13 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -81,7 +81,7 @@ touchkey@20 {
};
};

- i2c-gpio-1 {
+ i2c-gpio1 {
compatible = "i2c-gpio";
sda-gpios = <&gpio4 24 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 23 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -553,7 +553,7 @@ golden_cfg1 {
};
};

- i2c-gpio-0 {
+ i2c-gpio0 {
i2c_gpio_0_default: i2c_gpio_0 {
golden_cfg1 {
pins = "GPIO77", /* TOUCHKEY_SCL */
@@ -572,7 +572,7 @@ golden_cfg1 {
};
};

- i2c-gpio-1 {
+ i2c-gpio1 {
i2c_gpio_1_default: i2c_gpio_1 {
golden_cfg1 {
pins = "GPIO151", /* COMP_SCL */
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-janice.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-janice.dts
index 229f7c32103c..580a5da69187 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-janice.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-janice.dts
@@ -239,7 +239,7 @@ led {
};

/* Bit-banged I2C on GPIO143 and GPIO144 also called "SUBPMU I2C" */
- i2c-gpio-0 {
+ i2c-gpio0 {
compatible = "i2c-gpio";
sda-gpios = <&gpio4 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 15 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -324,7 +324,7 @@ gp2a_shunt: current-sense-shunt {
};

/* Bit-banged I2C on GPIO196 and GPIO197 also called "TOUCHKEY_I2C" */
- i2c-gpio-1 {
+ i2c-gpio1 {
compatible = "i2c-gpio";
sda-gpios = <&gpio6 5 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio6 4 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -352,7 +352,7 @@ touchkey@20 {
};

/* Bit-banged I2C on GPIO201 and GPIO202 also called "MOT_I2C" */
- i2c-gpio-2 {
+ i2c-gpio2 {
compatible = "i2c-gpio";
sda-gpios = <&gpio6 10 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio6 9 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -364,7 +364,7 @@ i2c-gpio-2 {
};

/* Bit-banged I2C on GPIO151 and GPIO152 also called "NFC_I2C" */
- i2c-gpio-3 {
+ i2c-gpio3 {
compatible = "i2c-gpio";
sda-gpios = <&gpio4 24 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 23 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -875,7 +875,7 @@ janice_cfg1 {
};
};
/* GPIO-based I2C bus for magnetometer and NCP6914 */
- i2c-gpio-0 {
+ i2c-gpio0 {
i2c_gpio_0_default: i2c_gpio_0 {
janice_cfg1 {
pins = "GPIO143_D12", "GPIO144_B13";
@@ -884,7 +884,7 @@ janice_cfg1 {
};
};
/* GPIO-based I2C bus for the Cypress touchkeys */
- i2c-gpio-1 {
+ i2c-gpio1 {
i2c_gpio_1_default: i2c_gpio_1 {
janice_cfg1 {
pins = "GPIO196_AG26", "GPIO197_AH24";
@@ -893,7 +893,7 @@ janice_cfg1 {
};
};
/* GPIO-based I2C bus for the Immersion ISA1200 */
- i2c-gpio-2 {
+ i2c-gpio2 {
i2c_gpio_2_default: i2c_gpio_2 {
janice_cfg1 {
pins = "GPIO201_AF24", "GPIO202_AF25";
@@ -902,7 +902,7 @@ janice_cfg1 {
};
};
/* GPIO-based I2C bus for the NFC */
- i2c-gpio-3 {
+ i2c-gpio3 {
i2c_gpio_3_default: i2c_gpio_3 {
janice_cfg1 {
pins = "GPIO151_D17", "GPIO152_D16";
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts
index cdb147dcc1db..bd8eb2b3bacd 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts
@@ -196,7 +196,7 @@ led {
};
};

- i2c-gpio-0 {
+ i2c-gpio0 {
compatible = "i2c-gpio";
sda-gpios = <&gpio4 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 15 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -207,7 +207,7 @@ i2c-gpio-0 {
/* TODO: this should be used by the NCP6914 Camera power management unit */
};

- i2c-gpio-1 {
+ i2c-gpio1 {
compatible = "i2c-gpio";
sda-gpios = <&gpio4 24 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 23 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -629,7 +629,7 @@ kyle_cfg1 {
};
};
/* GPIO-based I2C bus for NCP6914 */
- i2c-gpio-0 {
+ i2c-gpio0 {
i2c_gpio_0_default: i2c_gpio_0 {
kyle_cfg1 {
pins = "GPIO143_D12", "GPIO144_B13";
@@ -638,7 +638,7 @@ kyle_cfg1 {
};
};
/* GPIO-based I2C bus for ALPS HSCD compass */
- i2c-gpio-1 {
+ i2c-gpio1 {
i2c_gpio_1_default: i2c_gpio_1 {
kyle_cfg1 {
pins = "GPIO151_B17", "GPIO152_D16";
diff --git a/arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts
index 064d6fee8821..a8c854a82d4e 100644
--- a/arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts
+++ b/arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts
@@ -175,7 +175,7 @@ led {
};
};

- i2c-gpio-0 {
+ i2c-gpio0 {
compatible = "i2c-gpio";
sda-gpios = <&gpio4 16 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 15 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -186,7 +186,7 @@ i2c-gpio-0 {
/* TODO: this should be used by the NCP6914 Camera power management unit */
};

- i2c-gpio-1 {
+ i2c-gpio1 {
compatible = "i2c-gpio";
sda-gpios = <&gpio4 24 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 23 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
@@ -616,7 +616,7 @@ skomer_cfg1 {
};
};
/* GPIO-based I2C bus for NCP6914 */
- i2c-gpio-0 {
+ i2c-gpio0 {
i2c_gpio_0_default: i2c_gpio_0 {
skomer_cfg1 {
pins = "GPIO143_D12", "GPIO144_B13";
@@ -625,7 +625,7 @@ skomer_cfg1 {
};
};
/* GPIO-based I2C bus for ALPS HSCD compass */
- i2c-gpio-1 {
+ i2c-gpio1 {
i2c_gpio_1_default: i2c_gpio_1 {
skomer_cfg1 {
pins = "GPIO151_B17", "GPIO152_D16";
--
2.47.2