arm64: dts: lx2160a: complete pinmux for rcwsr12 configuration word

Commit 8a1365c7bbc1 ("arm64: dts: lx2160a: add pinmux and i2c gpio to
support bus recovery") introduced pinmux nodes for lx2160 i2c
interfaces, allowing runtime change between i2c and gpio functions
implementing bus recovery.

However, the dynamic configuration area (overwrite MUX) used by the
pinctrl-single driver initially reads as zero and does not reflect the
actual hardware state set by the Reset Configuration Word (RCW) at
power-on.

Because multiple groups of pins are configured from a single 32-bit
register, the first write from the pinctrl driver unintentionally clears
all other bits to zero.

Add description for all bits of RCWSR12 register, allowing boards to
explicitly define and restore their intended hardware state.

This includes i2c, gpio, flextimer, spi, can and sdhc functions.

Other configuration words, i.e. RCWSR13 & RCWSR14 may be added in the
future for boards setting non-zero values there.

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 d266bf96e2c6aded1084951e9e215f84d3a3ba8c..479982948ee539e16704ded43bb56067d9f0e365 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
@@ -1721,6 +1721,7 @@
                        pinctrl-single,register-width = <32>;
                        pinctrl-single,function-mask = <0x7>;
 
+                       /* RCWSR12 */
                        i2c1_pins: iic2-i2c-pins {
                                pinctrl-single,bits = <0x0 0x0 0x7>;
                        };
@@ -1729,6 +1730,10 @@
                                pinctrl-single,bits = <0x0 0x1 0x7>;
                        };
 
+                       ftm0_ch10_pins: iic2-ftm-pins {
+                               pinctrl-single,bits = <0x0 0x2 0x7>;
+                       };
+
                        esdhc0_cd_wp_pins: iic2-sdhc-pins {
                                pinctrl-single,bits = <0x0 0x6 0x7>;
                        };
@@ -1741,6 +1746,14 @@
                                pinctrl-single,bits = <0x0 (0x1 << 3) (0x7 << 3)>;
                        };
 
+                       can0_pins: iic3-can-pins {
+                               pinctrl-single,bits = <0x0 (0x2 << 3) (0x7 << 3)>;
+                       };
+
+                       event65_pins: iic3-event-pins {
+                               pinctrl-single,bits = <0x0 (0x6 << 3) (0x7 << 3)>;
+                       };
+
                        i2c3_pins: iic4-i2c-pins {
                                pinctrl-single,bits = <0x0 0x0 (0x7 << 6)>;
                        };
@@ -1749,6 +1762,14 @@
                                pinctrl-single,bits = <0x0 (0x1 << 6) (0x7 << 6)>;
                        };
 
+                       can1_pins: iic4-can-pins {
+                               pinctrl-single,bits = <0x0 (0x2 << 6) (0x7 << 6)>;
+                       };
+
+                       event87_pins: iic4-event-pins {
+                               pinctrl-single,bits = <0x0 (0x6 << 6) (0x7 << 6)>;
+                       };
+
                        i2c4_pins: iic5-i2c-pins {
                                pinctrl-single,bits = <0x0 0x0 (0x7 << 9)>;
                        };
@@ -1757,6 +1778,14 @@
                                pinctrl-single,bits = <0x0 (0x1 << 9) (0x7 << 9)>;
                        };
 
+                       esdhc0_clksync_pins: iic5-sdhc-clk-pins {
+                               pinctrl-single,bits = <0x0 (0x2 << 9) (0x7 << 9)>;
+                       };
+
+                       dspi2_miso_mosi_pins: iic5-spi3-pins {
+                               pinctrl-single,bits = <0x3 (0x2 << 9) (0x7 << 9)>;
+                       };
+
                        i2c5_pins: iic6-i2c-pins {
                                pinctrl-single,bits = <0x0 0x0 (0x7 << 12)>;
                        };
@@ -1765,26 +1794,71 @@
                                pinctrl-single,bits = <0x0 (0x1 << 12) (0x7 << 12)>;
                        };
 
+                       esdhc1_clksync_pins: iic6-sdhc-clk-pins {
+                               pinctrl-single,bits = <0x0 (0x2 << 12) (0x7 << 12)>;
+                       };
+
                        fspi_data74_pins: xspi1-data74-pins {
                                pinctrl-single,bits = <0x0 0x0 (0x7 << 15)>;
                        };
 
+                       gpio1_31_28_pins: xspi1-data74-gpio-pins {
+                               pinctrl-single,bits = <0x0 0x1 (0x7 << 15)>;
+                       };
+
                        fspi_data30_pins: xspi1-data30-pins {
                                pinctrl-single,bits = <0x0 0x0 (0x7 << 18)>;
                        };
 
+                       gpio1_27_24_pins: xspi1-data30-gpio-pins {
+                               pinctrl-single,bits = <0x0 0x1 (0x7 << 18)>;
+                       };
+
                        fspi_dqs_sck_cs10_pins: xspi1-base-pins {
                                pinctrl-single,bits = <0x0 0x0 (0x7 << 21)>;
                        };
 
+                       gpio1_23_20_pins: xspi1-base-gpio-pins {
+                               pinctrl-single,bits = <0x0 0x1 (0x7 << 21)>;
+                       };
+
                        esdhc0_cmd_data30_clk_vsel_pins: sdhc1-base-sdhc-vsel-pins {
                                pinctrl-single,bits = <0x0 0x0 (0x7 << 24)>;
                        };
 
+                       gpio0_21_15_pins: sdhc1-base-gpio-pins {
+                               pinctrl-single,bits = <0x0 (0x1 << 24) (0x7 << 24)>;
+                       };
+
+                       dspi0_pins: sdhc1-base-spi1-pins {
+                               pinctrl-single,bits = <0x0 (0x2 << 24) (0x7 << 24)>;
+                       };
+
+                       esdhc0_cmd_data30_clk_dspi2_cs0_pins: sdhc1-base-sdhc-spi3-pins {
+                               pinctrl-single,bits = <0x0 (0x3 << 24) (0x7 << 24)>;
+                       };
+
+                       esdhc0_cmd_data30_clk_data4_pins: sdhc1-base-sdhc-data4-pins {
+                               pinctrl-single,bits = <0x0 (0x4 << 24) (0x7 << 24)>;
+                       };
+
+                       esdhc0_dir_pins: sdhc1-dir-pins {
+                               pinctrl-single,bits = <0x0 0x0 (0x7 << 27)>;
+                       };
+
                        gpio0_14_12_pins: sdhc1-dir-gpio-pins {
                                pinctrl-single,bits = <0x0 (0x1 << 27) (0x7 << 27)>;
                        };
 
+                       dspi2_cs31_pins: sdhc1-dir-spi3-pins {
+                               pinctrl-single,bits = <0x0 (0x3 << 27) (0x7 << 27)>;
+                       };
+
+                       esdhc0_data75_pins: sdhc1-dir-sdhc-pins {
+                               pinctrl-single,bits = <0x0 (0x4 << 27) (0x7 << 27)>;
+                       };
+
+                       /* RCWSR13 */
                        gpio1_18_15_pins: iic8-iic7-gpio-pins {
                                pinctrl-single,bits = <0x4 0x1 0x7>;
                        };
@@ -1793,6 +1867,7 @@
                                pinctrl-single,bits = <0x4 0x2 0x7>;
                        };
 
+                       /* RCWSR14 */
                        i2c0_pins: iic1-i2c-pins {
                                pinctrl-single,bits = <0x8 0x0 (0x1 << 10)>;
                        };