From: Sinthu Raja <sinthu.r...@ti.com>
Pin-mux nodes should not be present in the R5 dts file; instead, they
should be inherited from the board dts file. To enable/override the
appropriate configurations, remove the pinmux nodes from am68-sk-r5 dts
and inherit the nodes from board dts.
Signed-off-by: Sinthu Raja <sinthu.r...@ti.com>
---
arch/arm/dts/k3-am68-sk-base-board.dts | 18 +++++++
arch/arm/dts/k3-am68-sk-r5-base-board.dts | 63 +----------------------
2 files changed, 20 insertions(+), 61 deletions(-)
diff --git a/arch/arm/dts/k3-am68-sk-base-board.dts
b/arch/arm/dts/k3-am68-sk-base-board.dts
index 8fc03324ab..df45be1a83 100644
--- a/arch/arm/dts/k3-am68-sk-base-board.dts
+++ b/arch/arm/dts/k3-am68-sk-base-board.dts
@@ -136,6 +136,24 @@
J721S2_WKUP_IOPAD(0x098, PIN_INPUT, 0) /* (A22)
MCU_MDIO0_MDIO */
>;
};
+
+ mcu_uart0_pins_default: mcu-uart0-pins-default {
+ bootph-pre-ram;
+ pinctrl-single,pins = <
+ J721S2_WKUP_IOPAD(0x0f4, PIN_INPUT, 0) /*(C24)
WKUP_GPIO0_13.MCU_UART0_RXD*/
+ J721S2_WKUP_IOPAD(0x0f0, PIN_OUTPUT, 0) /*(C25)
WKUP_GPIO0_12.MCU_UART0_TXD*/
+ >;
+ };
+
+ wkup_uart0_pins_default: wkup-uart0-pins-default {
+ bootph-pre-ram;
+ pinctrl-single,pins = <
+ J721S2_WKUP_IOPAD(0x0d8, PIN_INPUT, 0) /*(E25)
WKUP_GPIO0_6.WKUP_UART0_CTSn*/
+ J721S2_WKUP_IOPAD(0x0dc, PIN_OUTPUT, 0) /*(F28)
WKUP_GPIO0_7.WKUP_UART0_RTSn*/
+ J721S2_WKUP_IOPAD(0x0b0, PIN_INPUT, 0) /* (D28)
WKUP_UART0_RXD */
+ J721S2_WKUP_IOPAD(0x0b4, PIN_OUTPUT, 0) /* (D27)
WKUP_UART0_TXD */
+ >;
+ };
};
&main_gpio2 {
diff --git a/arch/arm/dts/k3-am68-sk-r5-base-board.dts
b/arch/arm/dts/k3-am68-sk-r5-base-board.dts
index a64baba149..77d7c0d77d 100644
--- a/arch/arm/dts/k3-am68-sk-r5-base-board.dts
+++ b/arch/arm/dts/k3-am68-sk-r5-base-board.dts
@@ -5,7 +5,7 @@
/dts-v1/;
-#include "k3-am68-sk-som.dtsi"
+#include "k3-am68-sk-base-board.dts"
#include "k3-j721s2-ddr-evm-lp4-4266.dtsi"
#include "k3-j721s2-ddr.dtsi"
@@ -96,55 +96,6 @@
};
};
-&main_pmx0 {
- main_uart8_pins_default: main-uart8-pins-default {
- pinctrl-single,pins = <
- J721S2_IOPAD(0x0d0, PIN_INPUT, 11) /* (AF26)
SPI0_CS1.UART8_RXD */
- J721S2_IOPAD(0x0d4, PIN_OUTPUT, 11) /* (AH27)
SPI0_CLK.UART8_TXD */
- >;
- };
-
- main_mmc1_pins_default: main-mmc1-pins-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 */
- J721S2_IOPAD(0x0f0, PIN_INPUT, 0) /* (R22) MMC1_DAT3 */
- J721S2_IOPAD(0x0e8, PIN_INPUT, 8) /* (AE25)
TIMER_IO0.MMC1_SDCD */
- >;
- };
-
- main_usbss0_pins_default: main-usbss0-pins-default {
- pinctrl-single,pins = <
- J721S2_IOPAD(0x0ec, PIN_OUTPUT, 6) /* (AG25)
TIMER_IO1.USB0_DRVVBUS */
- >;
- };
-};
-
-&wkup_pmx0 {
- mcu_uart0_pins_default: mcu-uart0-pins-default {
- bootph-pre-ram;
- pinctrl-single,pins = <
- J721S2_WKUP_IOPAD(0x0f4, PIN_INPUT, 0) /*(C24)
WKUP_GPIO0_13.MCU_UART0_RXD*/
- J721S2_WKUP_IOPAD(0x0f0, PIN_OUTPUT, 0) /*(C25)
WKUP_GPIO0_12.MCU_UART0_TXD*/
- >;
- };
-
- wkup_uart0_pins_default: wkup-uart0-pins-default {
- bootph-pre-ram;
- pinctrl-single,pins = <
- J721S2_WKUP_IOPAD(0x0d8, PIN_INPUT, 0) /*(E25)
WKUP_GPIO0_6.WKUP_UART0_CTSn*/
- J721S2_WKUP_IOPAD(0x0dc, PIN_OUTPUT, 0) /*(F28)
WKUP_GPIO0_7.WKUP_UART0_RTSn*/
- J721S2_WKUP_IOPAD(0x0b0, PIN_INPUT, 0) /* (D28)
WKUP_UART0_RXD */
- J721S2_WKUP_IOPAD(0x0b4, PIN_OUTPUT, 0) /* (D27)
WKUP_UART0_TXD */
- >;
- };
-
-};
-
&sms {
mboxes= <&mcu_secproxy 8>, <&mcu_secproxy 6>, <&mcu_secproxy 5>;
mbox-names = "tx", "rx", "notify";
@@ -154,6 +105,7 @@
};
&wkup_uart0 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&wkup_uart0_pins_default>;
};
@@ -163,21 +115,10 @@
pinctrl-0 = <&mcu_uart0_pins_default>;
};
-&main_uart8 {
- pinctrl-names = "default";
- pinctrl-0 = <&main_uart8_pins_default>;
-};
-
-&main_sdhci0 {
- status = "disabled";
-};
-
&main_sdhci1 {
/delete-property/ power-domains;
/delete-property/ assigned-clocks;
/delete-property/ assigned-clock-parents;
- pinctrl-0 = <&main_mmc1_pins_default>;
- pinctrl-names = "default";
clock-names = "clk_xin";
clocks = <&clk_200mhz>;
ti,driver-strength-ohm = <50>;
--
2.36.1
