Commit a84e0556 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/63e97cb50282b3255ba9654f539b9baa8c621b30.1698068647.git.geert+renesas@glider.be
parent bfc1d3a9
...@@ -303,7 +303,7 @@ gpioi2c2: i2c-9 { ...@@ -303,7 +303,7 @@ gpioi2c2: i2c-9 {
* *
* IIC0/I2C0 does not appear to support fallback to GPIO. * IIC0/I2C0 does not appear to support fallback to GPIO.
*/ */
i2cexio0: i2c-10 { i2cexio0: i2c-mux1 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
i2c-parent = <&iic0>, <&i2c0>; i2c-parent = <&iic0>, <&i2c0>;
i2c-bus-name = "i2c-exio0"; i2c-bus-name = "i2c-exio0";
...@@ -316,7 +316,7 @@ i2cexio0: i2c-10 { ...@@ -316,7 +316,7 @@ i2cexio0: i2c-10 {
* This is similar to the arangement described for i2cexio0 (above) * This is similar to the arangement described for i2cexio0 (above)
* with a fallback to GPIO also provided. * with a fallback to GPIO also provided.
*/ */
i2cexio1: i2c-11 { i2cexio1: i2c-mux2 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
i2c-parent = <&iic1>, <&i2c1>, <&gpioi2c1>; i2c-parent = <&iic1>, <&i2c1>, <&gpioi2c1>;
i2c-bus-name = "i2c-exio1"; i2c-bus-name = "i2c-exio1";
...@@ -328,7 +328,7 @@ i2cexio1: i2c-11 { ...@@ -328,7 +328,7 @@ i2cexio1: i2c-11 {
* IIC2 and I2C2 may be switched using pinmux. * IIC2 and I2C2 may be switched using pinmux.
* A fallback to GPIO is also provided. * A fallback to GPIO is also provided.
*/ */
i2chdmi: i2c-12 { i2chdmi: i2c-mux3 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
i2c-parent = <&iic2>, <&i2c2>, <&gpioi2c2>; i2c-parent = <&iic2>, <&i2c2>, <&gpioi2c2>;
i2c-bus-name = "i2c-hdmi"; i2c-bus-name = "i2c-hdmi";
...@@ -417,7 +417,7 @@ adv7612_out: endpoint { ...@@ -417,7 +417,7 @@ adv7612_out: endpoint {
* IIC3 and I2C3 may be switched using pinmux. * IIC3 and I2C3 may be switched using pinmux.
* IIC3/I2C3 does not appear to support fallback to GPIO. * IIC3/I2C3 does not appear to support fallback to GPIO.
*/ */
i2cpwr: i2c-13 { i2cpwr: i2c-mux4 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pmic_irq_pins>; pinctrl-0 = <&pmic_irq_pins>;
......
...@@ -340,7 +340,7 @@ gpioi2c4: i2c-11 { ...@@ -340,7 +340,7 @@ gpioi2c4: i2c-11 {
* I2C1 is routed to EXIO connector B, pins 64 (SCL) + 66 (SDA). * I2C1 is routed to EXIO connector B, pins 64 (SCL) + 66 (SDA).
* A fallback to GPIO is provided. * A fallback to GPIO is provided.
*/ */
i2cexio1: i2c-12 { i2cexio1: i2c-mux1 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
i2c-parent = <&i2c1>, <&gpioi2c1>; i2c-parent = <&i2c1>, <&gpioi2c1>;
i2c-bus-name = "i2c-exio1"; i2c-bus-name = "i2c-exio1";
...@@ -351,7 +351,7 @@ i2cexio1: i2c-12 { ...@@ -351,7 +351,7 @@ i2cexio1: i2c-12 {
/* /*
* A fallback to GPIO is provided for I2C2. * A fallback to GPIO is provided for I2C2.
*/ */
i2chdmi: i2c-13 { i2chdmi: i2c-mux2 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
i2c-parent = <&i2c2>, <&gpioi2c2>; i2c-parent = <&i2c2>, <&gpioi2c2>;
i2c-bus-name = "i2c-hdmi"; i2c-bus-name = "i2c-hdmi";
...@@ -446,7 +446,7 @@ eeprom@50 { ...@@ -446,7 +446,7 @@ eeprom@50 {
* I2C4 is routed to EXIO connector E, pins 37 (SCL) + 39 (SDA). * I2C4 is routed to EXIO connector E, pins 37 (SCL) + 39 (SDA).
* A fallback to GPIO is provided. * A fallback to GPIO is provided.
*/ */
i2cexio4: i2c-14 { i2cexio4: i2c-mux3 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
i2c-parent = <&i2c4>, <&gpioi2c4>; i2c-parent = <&i2c4>, <&gpioi2c4>;
i2c-bus-name = "i2c-exio4"; i2c-bus-name = "i2c-exio4";
......
...@@ -148,7 +148,7 @@ gpioi2c2: i2c-9 { ...@@ -148,7 +148,7 @@ gpioi2c2: i2c-9 {
/* /*
* A fallback to GPIO is provided for I2C2. * A fallback to GPIO is provided for I2C2.
*/ */
i2chdmi: i2c-10 { i2chdmi: i2c-mux1 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
i2c-parent = <&i2c2>, <&gpioi2c2>; i2c-parent = <&i2c2>, <&gpioi2c2>;
i2c-bus-name = "i2c-hdmi"; i2c-bus-name = "i2c-hdmi";
......
...@@ -324,7 +324,7 @@ gpioi2c4: i2c-10 { ...@@ -324,7 +324,7 @@ gpioi2c4: i2c-10 {
/* /*
* A fallback to GPIO is provided for I2C2. * A fallback to GPIO is provided for I2C2.
*/ */
i2chdmi: i2c-11 { i2chdmi: i2c-mux1 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
i2c-parent = <&i2c2>, <&gpioi2c2>; i2c-parent = <&i2c2>, <&gpioi2c2>;
i2c-bus-name = "i2c-hdmi"; i2c-bus-name = "i2c-hdmi";
...@@ -430,7 +430,7 @@ eeprom@50 { ...@@ -430,7 +430,7 @@ eeprom@50 {
* I2C4 is routed to EXIO connector E, pins 37 (SCL) + 39 (SDA). * I2C4 is routed to EXIO connector E, pins 37 (SCL) + 39 (SDA).
* A fallback to GPIO is provided. * A fallback to GPIO is provided.
*/ */
i2cexio4: i2c-12 { i2cexio4: i2c-mux2 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
i2c-parent = <&i2c4>, <&gpioi2c4>; i2c-parent = <&i2c4>, <&gpioi2c4>;
i2c-bus-name = "i2c-exio4"; i2c-bus-name = "i2c-exio4";
......
...@@ -192,7 +192,7 @@ gpioi2c4: i2c-10 { ...@@ -192,7 +192,7 @@ gpioi2c4: i2c-10 {
/* /*
* A fallback to GPIO is provided for I2C1. * A fallback to GPIO is provided for I2C1.
*/ */
i2chdmi: i2c-11 { i2chdmi: i2c-mux1 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
i2c-parent = <&i2c1>, <&gpioi2c1>; i2c-parent = <&i2c1>, <&gpioi2c1>;
i2c-bus-name = "i2c-hdmi"; i2c-bus-name = "i2c-hdmi";
...@@ -222,7 +222,7 @@ eeprom@50 { ...@@ -222,7 +222,7 @@ eeprom@50 {
* I2C4 is routed to EXIO connector B, pins 73 (SCL) + 74 (SDA). * I2C4 is routed to EXIO connector B, pins 73 (SCL) + 74 (SDA).
* A fallback to GPIO is provided. * A fallback to GPIO is provided.
*/ */
i2cexio4: i2c-14 { i2cexio4: i2c-mux2 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
i2c-parent = <&i2c4>, <&gpioi2c4>; i2c-parent = <&i2c4>, <&gpioi2c4>;
i2c-bus-name = "i2c-exio4"; i2c-bus-name = "i2c-exio4";
......
...@@ -225,7 +225,7 @@ gpioi2c1: i2c-9 { ...@@ -225,7 +225,7 @@ gpioi2c1: i2c-9 {
/* /*
* A fallback to GPIO is provided for I2C1. * A fallback to GPIO is provided for I2C1.
*/ */
i2chdmi: i2c-10 { i2chdmi: i2c-mux1 {
compatible = "i2c-demux-pinctrl"; compatible = "i2c-demux-pinctrl";
i2c-parent = <&i2c1>, <&gpioi2c1>; i2c-parent = <&i2c1>, <&gpioi2c1>;
i2c-bus-name = "i2c-hdmi"; i2c-bus-name = "i2c-hdmi";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment