arm64: dts: lx2160a: remove duplicate pinmux nodes

LX2160A pinmux is done in groups by various length bitfields within
configuration registers.

The pinmux nodes i2c7-scl-pins and i2c7-scl-gpio-pins are duplicates of
i2c6-scl-gpio and i2c6-scl-gpio-pins, writing to the same register and
bits.

These two i2c buses i2c6/i2c7 (IIC7/IIC8) are configured together in
register RCWSR13 bits 3-0.

Drop the duplicate node name and change references to the i2c6 node.

Fixes: 8a1365c7bbc1 ("arm64: dts: lx2160a: add pinmux and i2c gpio to support bus recovery")
Signed-off-by: Josua Mayer <josua@solid-run.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
index d5bb55df03216d1ddc45e092d8b43609f8984acd..41c9b4253f4a5736377df6409e9f040aa22098bf 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
@@ -862,8 +862,8 @@
                        clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
                                            QORIQ_CLK_PLL_DIV(16)>;
                        pinctrl-names = "default", "gpio";
-                       pinctrl-0 = <&i2c7_scl>;
-                       pinctrl-1 = <&i2c7_scl_gpio>;
+                       pinctrl-0 = <&i2c6_scl>;
+                       pinctrl-1 = <&i2c6_scl_gpio>;
                        scl-gpios = <&gpio1 18 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
                        status = "disabled";
                };
@@ -1785,14 +1785,6 @@
                                pinctrl-single,bits = <0x4 0x1 0x7>;
                        };
 
-                       i2c7_scl: i2c7-scl-pins {
-                               pinctrl-single,bits = <0x4 0x2 0x7>;
-                       };
-
-                       i2c7_scl_gpio: i2c7-scl-gpio-pins {
-                               pinctrl-single,bits = <0x4 0x1 0x7>;
-                       };
-
                        i2c0_scl: i2c0-scl-pins {
                                pinctrl-single,bits = <0x8 0x0 (0x1 << 10)>;
                        };