[PATCH V4 1/3] arm64: dts: ti: k3-j721s2: fix main pinmux range

[Sinthu Raja]

From: Sinthu Raja <sinthu.raja at ti.com>

PADCONFIG_64 register is non-addressable in the existing main pinmux
region. So only valid registers are included and main pinmux region
is split into two ranges as follows. Also update references to old
nodes with new ones as per the newly split main_pmx* node.

main_pmx0 -> 64 pins (WKUP_PADCONFIG 0 - 63)
main_pmx1 -> 7 pins (WKUP_PADCONFIG 65 - 71)

Fixes: b8545f9d3a54 ("arm64: dts: ti: Add initial support for J721S2 SoC")
Signed-off-by: Sinthu Raja <sinthu.raja at ti.com>
---
 arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 15 +++++++++++----
 .../boot/dts/ti/k3-j721s2-common-proc-board.dts  | 16 +++++++++++-----
 arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi       | 11 ++++++++++-
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
index 27a43a8ecffd..711757997804 100644
--- a/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts
@@ -136,10 +136,8 @@ J721S2_IOPAD(0x0e4, PIN_INPUT, 0) /* (AE24) I2C0_SDA */
 		>;
 	};
 
-	main_mmc1_pins_default: main-mmc1-pins-default {
+	main_mmc1_pins0_default: main-mmc1-pins0-default {
 		pinctrl-single,pins = <
-			J721S2_IOPAD(0x104, PIN_INPUT, 0) /* (P23) MMC1_CLK */
-			J721S2_IOPAD(0x108, PIN_INPUT, 0) /* (N24) MMC1_CMD */
 			J721S2_IOPAD(0x0fc, PIN_INPUT, 0) /* (M23) MMC1_DAT0 */
 			J721S2_IOPAD(0x0f8, PIN_INPUT, 0) /* (P24) MMC1_DAT1 */
 			J721S2_IOPAD(0x0f4, PIN_INPUT, 0) /* (R24) MMC1_DAT2 */
@@ -175,6 +173,15 @@ J721S2_IOPAD(0x09c, PIN_INPUT, 0) /* (T24) MCASP0_AXR11.MCAN7_TX */
 	};
 };
 
+&main_pmx1 {
+	main_mmc1_pins1_default: main-mmc1-pins1-default {
+		pinctrl-single,pins = <
+			J721S2_IOPAD(0x000, PIN_INPUT, 0) /* (P23) MMC1_CLK */
+			J721S2_IOPAD(0x004, PIN_INPUT, 0) /* (N24) MMC1_CMD */
+		>;
+	};
+};
+
 &wkup_pmx0 {
 	mcu_cpsw_pins_default: mcu-cpsw-pins-default {
 		pinctrl-single,pins = <
@@ -278,7 +285,7 @@ &main_sdhci0 {
 
 &main_sdhci1 {
 	/* SD card */
-	pinctrl-0 = <&main_mmc1_pins_default>;
+	pinctrl-0 = <&main_mmc1_pins0_default &main_mmc1_pins1_default>;
 	pinctrl-names = "default";
 	disable-wp;
 	vmmc-supply = <&vdd_mmc1>;
diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
index b4b9edfe2d12..6141ae487cba 100644
--- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
@@ -126,11 +126,8 @@ J721S2_IOPAD(0x060, PIN_INPUT_PULLUP, 13) /* (AC27) MCASP2_AXR1.I2C3_SDA */
 		>;
 	};
 
-	main_mmc1_pins_default: main-mmc1-pins-default {
+	main_mmc1_pins0_default: main-mmc1-pins0-default {
 		pinctrl-single,pins = <
-			J721S2_IOPAD(0x104, PIN_INPUT, 0) /* (P23) MMC1_CLK */
-			J721S2_IOPAD(0x108, PIN_INPUT, 0) /* (N24) MMC1_CMD */
-			J721S2_IOPAD(0x100, PIN_INPUT, 0) /* (###) MMC1_CLKLB */
 			J721S2_IOPAD(0x0fc, PIN_INPUT, 0) /* (M23) MMC1_DAT0 */
 			J721S2_IOPAD(0x0f8, PIN_INPUT, 0) /* (P24) MMC1_DAT1 */
 			J721S2_IOPAD(0x0f4, PIN_INPUT, 0) /* (R24) MMC1_DAT2 */
@@ -146,6 +143,15 @@ J721S2_IOPAD(0x020, PIN_INPUT, 7) /* (AA23) MCAN15_RX.GPIO0_8 */
 	};
 };
 
+&main_pmx1 {
+	main_mmc1_pins1_default: main-mmc1-pins1-default {
+		pinctrl-single,pins = <
+			J721S2_IOPAD(0x000, PIN_INPUT, 0) /* (P23) MMC1_CLK */
+			J721S2_IOPAD(0x004, PIN_INPUT, 0) /* (N24) MMC1_CMD */
+		>;
+	};
+};
+
 &wkup_pmx0 {
 	mcu_cpsw_pins_default: mcu-cpsw-pins-default {
 		pinctrl-single,pins = <
@@ -296,7 +302,7 @@ &main_sdhci0 {
 
 &main_sdhci1 {
 	/* SD card */
-	pinctrl-0 = <&main_mmc1_pins_default>;
+	pinctrl-0 = <&main_mmc1_pins0_default &main_mmc1_pins1_default>;
 	pinctrl-names = "default";
 	disable-wp;
 	vmmc-supply = <&vdd_mmc1>;
diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
index 2dd7865f7654..a8d9336d1848 100644
--- a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
@@ -66,7 +66,16 @@ main_gpio_intr: interrupt-controller at a00000 {
 	main_pmx0: pinctrl at 11c000 {
 		compatible = "pinctrl-single";
 		/* Proxy 0 addressing */
-		reg = <0x0 0x11c000 0x0 0x120>;
+		reg = <0x0 0x11c000 0x0 0x100>;
+		#pinctrl-cells = <1>;
+		pinctrl-single,register-width = <32>;
+		pinctrl-single,function-mask = <0xffffffff>;
+	};
+
+	main_pmx1: pinctrl at 11c104 {
+		compatible = "pinctrl-single";
+		/* Proxy 0 addressing */
+		reg = <0x0 0x11c104 0x0 0x1C>;
 		#pinctrl-cells = <1>;
 		pinctrl-single,register-width = <32>;
 		pinctrl-single,function-mask = <0xffffffff>;
-- 
2.36.1