Skip to content

Commit eee296c

Browse files
Josua-SRgregkh
authored andcommitted
arm64: dts: lx2160a: remove duplicate pinmux nodes
[ Upstream commit 325ca51 ] 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: 8a1365c ("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent ad3b11f commit eee296c

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -862,8 +862,8 @@
862862
clocks = <&clockgen QORIQ_CLK_PLATFORM_PLL
863863
QORIQ_CLK_PLL_DIV(16)>;
864864
pinctrl-names = "default", "gpio";
865-
pinctrl-0 = <&i2c7_scl>;
866-
pinctrl-1 = <&i2c7_scl_gpio>;
865+
pinctrl-0 = <&i2c6_scl>;
866+
pinctrl-1 = <&i2c6_scl_gpio>;
867867
scl-gpios = <&gpio1 18 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
868868
status = "disabled";
869869
};
@@ -1785,14 +1785,6 @@
17851785
pinctrl-single,bits = <0x4 0x1 0x7>;
17861786
};
17871787

1788-
i2c7_scl: i2c7-scl-pins {
1789-
pinctrl-single,bits = <0x4 0x2 0x7>;
1790-
};
1791-
1792-
i2c7_scl_gpio: i2c7-scl-gpio-pins {
1793-
pinctrl-single,bits = <0x4 0x1 0x7>;
1794-
};
1795-
17961788
i2c0_scl: i2c0-scl-pins {
17971789
pinctrl-single,bits = <0x8 0x0 (0x1 << 10)>;
17981790
};

0 commit comments

Comments
 (0)