From 263516b9bbffd5f679bbddaae47300b93551bbfc Mon Sep 17 00:00:00 2001 From: Udit Kumar Date: Mon, 26 Jun 2023 16:36:13 +0530 Subject: [PATCH] arm: dts: k3-j784s4: correct pin mux fixing pin mux for J784S4 evm due to split of wkup_pmx. Also removing pin mux from R5. Cc: Vaishnav Achath Cc: Thejasvi Konduru Cc: Siddharth Vadapalli Cc: Dasnavis Sabiya Signed-off-by: Udit Kumar --- arch/arm/dts/k3-j784s4-evm-u-boot.dtsi | 3 +++ arch/arm/dts/k3-j784s4-evm.dts | 21 +++++++++++++++++++++ arch/arm/dts/k3-j784s4-r5-evm.dts | 22 ---------------------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/arch/arm/dts/k3-j784s4-evm-u-boot.dtsi b/arch/arm/dts/k3-j784s4-evm-u-boot.dtsi index 6a0ece99ef..70d644517d 100644 --- a/arch/arm/dts/k3-j784s4-evm-u-boot.dtsi +++ b/arch/arm/dts/k3-j784s4-evm-u-boot.dtsi @@ -109,6 +109,9 @@ bootph-pre-ram; }; +&wkup_pmx2 { + bootph-pre-ram; +}; &k3_pds { bootph-pre-ram; }; diff --git a/arch/arm/dts/k3-j784s4-evm.dts b/arch/arm/dts/k3-j784s4-evm.dts index 8e01617518..23e33db1fd 100644 --- a/arch/arm/dts/k3-j784s4-evm.dts +++ b/arch/arm/dts/k3-j784s4-evm.dts @@ -316,6 +316,27 @@ >; }; + mcu_uart0_pins_default: mcu-uart0-pins-default { + pinctrl-single,pins = < + J784S4_WKUP_IOPAD(0x090, PIN_INPUT, 0) /* (H37) MCU_UART0_CTSn */ + J784S4_WKUP_IOPAD(0x094, PIN_OUTPUT, 0) /* (K37) MCU_UART0_RTSn */ + J784S4_WKUP_IOPAD(0x08C, PIN_INPUT, 0) /* (K38) MCU_UART0_RXD */ + J784S4_WKUP_IOPAD(0x088, PIN_OUTPUT, 0) /* (J37) MCU_UART0_TXD */ + >; + }; + + wkup_uart0_pins_default: wkup-uart0-pins-default { + pinctrl-single,pins = < + J784S4_WKUP_IOPAD(0x070, PIN_INPUT, 0) /* (E25) WKUP_UART0_CTSn */ + J784S4_WKUP_IOPAD(0x074, PIN_OUTPUT, 0) /* (F28) WKUP_UART0_RTSn */ + J784S4_WKUP_IOPAD(0x048, PIN_INPUT, 0) /* (K35) WKUP_UART0_RXD */ + J784S4_WKUP_IOPAD(0x04c, PIN_OUTPUT, 0) /* (K34) WKUP_UART0_TXD */ + >; + }; + +}; + +&wkup_pmx0 { typec_dir_gpio_pins_default: typec-dir-gpio-pins-default { pinctrl-single,pins = < /* (A33) MCU_OSPI0_CSn1.WKUP_GPIO0_28 */ diff --git a/arch/arm/dts/k3-j784s4-r5-evm.dts b/arch/arm/dts/k3-j784s4-r5-evm.dts index 674c0b2f4c..79ab4dc5c8 100644 --- a/arch/arm/dts/k3-j784s4-r5-evm.dts +++ b/arch/arm/dts/k3-j784s4-r5-evm.dts @@ -107,28 +107,6 @@ }; }; -&wkup_pmx0 { - - mcu_uart0_pins_default: mcu-uart0-pins-default { - bootph-pre-ram; - pinctrl-single,pins = < - J784S4_WKUP_IOPAD(0x0f8, PIN_INPUT, 0) /* (H37) WKUP_GPIO0_14.MCU_UART0_CTSn */ - J784S4_WKUP_IOPAD(0x0fc, PIN_OUTPUT, 0) /* (K37) WKUP_GPIO0_15.MCU_UART0_RTSn */ - J784S4_WKUP_IOPAD(0x0f4, PIN_INPUT, 0) /* (K38) WKUP_GPIO0_13.MCU_UART0_RXD */ - J784S4_WKUP_IOPAD(0x0f0, PIN_OUTPUT, 0) /* (J37) WKUP_GPIO0_12.MCU_UART0_TXD */ - >; - }; - - wkup_uart0_pins_default: wkup-uart0-pins-default { - bootph-pre-ram; - pinctrl-single,pins = < - J784S4_WKUP_IOPAD(0x0d8, PIN_INPUT, 0) /* (E25) WKUP_GPIO0_6.WKUP_UART0_CTSn */ - J784S4_WKUP_IOPAD(0x0dc, PIN_OUTPUT, 0) /* (F28) WKUP_GPIO0_7.WKUP_UART0_RTSn */ - J784S4_WKUP_IOPAD(0x0b0, PIN_INPUT, 0) /* (K35) WKUP_UART0_RXD */ - J784S4_WKUP_IOPAD(0x0b4, PIN_OUTPUT, 0) /* (K34) WKUP_UART0_TXD */ - >; - }; -}; &sms { mboxes= <&mcu_secproxy 8>, <&mcu_secproxy 6>, <&mcu_secproxy 5>;