ARM: dts: renesas: rcar-gen2: Fix I2C bus demux node names

make dtbs_check:

    $nodename:0: 'i2c-10' does not match '^(i2c-?)?mux'

Fix this by renaming all I2C bus demultiplexer node names to
"i2c-mux<N>".

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/63e97cb50282b3255ba9654f539b9baa8c621b30.1698068647.git.geert+renesas@glider.be

diff --git a/arch/arm/boot/dts/renesas/r8a7790-lager.dts b/arch/arm/boot/dts/renesas/r8a7790-lager.dts
index 4d666ad8b114b33b2ef0e57aadc37a0fe3fbd798..bc04567ccf8d8d763cdb2db107942323638c7a54 100644 (file)
--- a/arch/arm/boot/dts/renesas/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/renesas/r8a7790-lager.dts
@@ -303,7 +303,7 @@ gpioi2c2: i2c-9 {
         *
         * IIC0/I2C0 does not appear to support fallback to GPIO.
         */
-       i2cexio0: i2c-10 {
+       i2cexio0: i2c-mux1 {
                compatible = "i2c-demux-pinctrl";
                i2c-parent = <&iic0>, <&i2c0>;
                i2c-bus-name = "i2c-exio0";
@@ -316,7 +316,7 @@ i2cexio0: i2c-10 {
         * This is similar to the arangement described for i2cexio0 (above)
         * with a fallback to GPIO also provided.
         */
-       i2cexio1: i2c-11 {
+       i2cexio1: i2c-mux2 {
                compatible = "i2c-demux-pinctrl";
                i2c-parent = <&iic1>, <&i2c1>, <&gpioi2c1>;
                i2c-bus-name = "i2c-exio1";
@@ -328,7 +328,7 @@ i2cexio1: i2c-11 {
         * IIC2 and I2C2 may be switched using pinmux.
         * A fallback to GPIO is also provided.
         */
-       i2chdmi: i2c-12 {
+       i2chdmi: i2c-mux3 {
                compatible = "i2c-demux-pinctrl";
                i2c-parent = <&iic2>, <&i2c2>, <&gpioi2c2>;
                i2c-bus-name = "i2c-hdmi";
@@ -417,7 +417,7 @@ adv7612_out: endpoint {
         * IIC3 and I2C3 may be switched using pinmux.
         * IIC3/I2C3 does not appear to support fallback to GPIO.
         */
-       i2cpwr: i2c-13 {
+       i2cpwr: i2c-mux4 {
                compatible = "i2c-demux-pinctrl";
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_irq_pins>;

diff --git a/arch/arm/boot/dts/renesas/r8a7791-koelsch.dts b/arch/arm/boot/dts/renesas/r8a7791-koelsch.dts
index 545515b41ea3fae12ed53beff5846e46d32e9f89..63ca0256975dd4115cbe3c22c82a261339a2258e 100644 (file)
--- a/arch/arm/boot/dts/renesas/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/renesas/r8a7791-koelsch.dts
@@ -340,7 +340,7 @@ gpioi2c4: i2c-11 {
         * I2C1 is routed to EXIO connector B, pins 64 (SCL) + 66 (SDA).
         * A fallback to GPIO is provided.
         */
-       i2cexio1: i2c-12 {
+       i2cexio1: i2c-mux1 {
                compatible = "i2c-demux-pinctrl";
                i2c-parent = <&i2c1>, <&gpioi2c1>;
                i2c-bus-name = "i2c-exio1";
@@ -351,7 +351,7 @@ i2cexio1: i2c-12 {
        /*
         * A fallback to GPIO is provided for I2C2.
         */
-       i2chdmi: i2c-13 {
+       i2chdmi: i2c-mux2 {
                compatible = "i2c-demux-pinctrl";
                i2c-parent = <&i2c2>, <&gpioi2c2>;
                i2c-bus-name = "i2c-hdmi";
@@ -446,7 +446,7 @@ eeprom@50 {
         * I2C4 is routed to EXIO connector E, pins 37 (SCL) + 39 (SDA).
         * A fallback to GPIO is provided.
         */
-       i2cexio4: i2c-14 {
+       i2cexio4: i2c-mux3 {
                compatible = "i2c-demux-pinctrl";
                i2c-parent = <&i2c4>, <&gpioi2c4>;
                i2c-bus-name = "i2c-exio4";

diff --git a/arch/arm/boot/dts/renesas/r8a7791-porter.dts b/arch/arm/boot/dts/renesas/r8a7791-porter.dts
index ec0a20d5130d6f0491a75d737973d7ae67f47ca6..65fd462e7b430589f6d0ee463caf459239255ae6 100644 (file)
--- a/arch/arm/boot/dts/renesas/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/renesas/r8a7791-porter.dts
@@ -148,7 +148,7 @@ gpioi2c2: i2c-9 {
        /*
         * A fallback to GPIO is provided for I2C2.
         */
-       i2chdmi: i2c-10 {
+       i2chdmi: i2c-mux1 {
                compatible = "i2c-demux-pinctrl";
                i2c-parent = <&i2c2>, <&gpioi2c2>;
                i2c-bus-name = "i2c-hdmi";

diff --git a/arch/arm/boot/dts/renesas/r8a7793-gose.dts b/arch/arm/boot/dts/renesas/r8a7793-gose.dts
index 79b537b24642662d2954a12dd06d2a88d5f28025..58e26706a5bc29536dfe867a240ca0a55d7a5a23 100644 (file)
--- a/arch/arm/boot/dts/renesas/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/renesas/r8a7793-gose.dts
@@ -324,7 +324,7 @@ gpioi2c4: i2c-10 {
        /*
         * A fallback to GPIO is provided for I2C2.
         */
-       i2chdmi: i2c-11 {
+       i2chdmi: i2c-mux1 {
                compatible = "i2c-demux-pinctrl";
                i2c-parent = <&i2c2>, <&gpioi2c2>;
                i2c-bus-name = "i2c-hdmi";
@@ -430,7 +430,7 @@ eeprom@50 {
         * I2C4 is routed to EXIO connector E, pins 37 (SCL) + 39 (SDA).
         * A fallback to GPIO is provided.
         */
-       i2cexio4: i2c-12 {
+       i2cexio4: i2c-mux2 {
                compatible = "i2c-demux-pinctrl";
                i2c-parent = <&i2c4>, <&gpioi2c4>;
                i2c-bus-name = "i2c-exio4";

diff --git a/arch/arm/boot/dts/renesas/r8a7794-alt.dts b/arch/arm/boot/dts/renesas/r8a7794-alt.dts
index 08df031bc27c9e03826389d353bf0298925a272d..c0d067df22a03d4e2590333965c7c8d7a6f539d6 100644 (file)
--- a/arch/arm/boot/dts/renesas/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/renesas/r8a7794-alt.dts
@@ -192,7 +192,7 @@ gpioi2c4: i2c-10 {
        /*
         * A fallback to GPIO is provided for I2C1.
         */
-       i2chdmi: i2c-11 {
+       i2chdmi: i2c-mux1 {
                compatible = "i2c-demux-pinctrl";
                i2c-parent = <&i2c1>, <&gpioi2c1>;
                i2c-bus-name = "i2c-hdmi";
@@ -222,7 +222,7 @@ eeprom@50 {
         * I2C4 is routed to EXIO connector B, pins 73 (SCL) + 74 (SDA).
         * A fallback to GPIO is provided.
         */
-       i2cexio4: i2c-14 {
+       i2cexio4: i2c-mux2 {
                compatible = "i2c-demux-pinctrl";
                i2c-parent = <&i2c4>, <&gpioi2c4>;
                i2c-bus-name = "i2c-exio4";

diff --git a/arch/arm/boot/dts/renesas/r8a7794-silk.dts b/arch/arm/boot/dts/renesas/r8a7794-silk.dts
index b7af1befa126ba624b8391f0e7fe8dd2f4320cac..01fb06d10cbdb45b4c688bc3b01c0c94c06fb06d 100644 (file)
--- a/arch/arm/boot/dts/renesas/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/renesas/r8a7794-silk.dts
@@ -225,7 +225,7 @@ gpioi2c1: i2c-9 {
        /*
         * A fallback to GPIO is provided for I2C1.
         */
-       i2chdmi: i2c-10 {
+       i2chdmi: i2c-mux1 {
                compatible = "i2c-demux-pinctrl";
                i2c-parent = <&i2c1>, <&gpioi2c1>;
                i2c-bus-name = "i2c-hdmi";