arm64: dts: ti: k3-am65: Enable UART nodes at the board level

UART nodes defined in the top-level AM65x SoC dtsi files are incomplete
and may not be functional unless they are extended with pinmux
information.

As the pinmux is only known at the board integration level, these
nodes should only be enabled when provided with this information.

Disable the UART nodes in the dtsi files and only enable the ones that
are actually pinned out on a given board.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Tested-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Bryan Brattlof <bb@ti.com>
Link: https://lore.kernel.org/r/20221028142417.10642-2-afd@ti.com

diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
index 32b7972375811e998362771c2525c70476c1ae45..7b3087c19141c5b8524fcb7a1de5fd51db654343 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
@@ -360,15 +360,13 @@
 };
 
 &main_uart1 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_uart1_pins_default>;
 };
 
-&main_uart2 {
-       status = "disabled";
-};
-
 &mcu_uart0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&arduino_uart_pins_default>;
 };

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 4005a73cfea990bce88fd50e4972e76a1e03e306..ae414f5d83822d2a4dfec950110e8d09c97439a6 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -91,6 +91,7 @@
                clock-frequency = <48000000>;
                current-speed = <115200>;
                power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_uart1: serial@2810000 {
@@ -99,6 +100,7 @@
                interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <48000000>;
                power-domains = <&k3_pds 147 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_uart2: serial@2820000 {
@@ -107,6 +109,7 @@
                interrupts = <GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH>;
                clock-frequency = <48000000>;
                power-domains = <&k3_pds 148 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        crypto: crypto@4e00000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
index 1807ec4730cb58b4d5c3e8396942705ca0a8c609..d5099456a901f9c1f34286c8a3fbac85e4a355c1 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
@@ -22,11 +22,12 @@
 
        mcu_uart0: serial@40a00000 {
                compatible = "ti,am654-uart";
-                       reg = <0x00 0x40a00000 0x00 0x100>;
-                       interrupts = <GIC_SPI 565 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-frequency = <96000000>;
-                       current-speed = <115200>;
-                       power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;
+               reg = <0x00 0x40a00000 0x00 0x100>;
+               interrupts = <GIC_SPI 565 IRQ_TYPE_LEVEL_HIGH>;
+               clock-frequency = <96000000>;
+               current-speed = <115200>;
+               power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcu_ram: sram@41c00000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
index fa11d7142006a72a8273a6c0e492ccf69bb8e33d..bbe31532f984b8103e447fec3ef949117e0797df 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
@@ -54,6 +54,7 @@
                clock-frequency = <48000000>;
                current-speed = <115200>;
                power-domains = <&k3_pds 150 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        wkup_i2c0: i2c@42120000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi b/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi
index 4a9bf7d7c07dc352f89723d42d65bbb6972c9507..cd43fd11a5c2c424f841945044677854adacb99d 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi
@@ -50,6 +50,7 @@
 };
 
 &main_uart0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_uart0_pins_default>;
 };

diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index 5850582dd4edfbd14270dacec4aa11e9eeafca2a..956e9bc946b5f3a370dd17d007835dba8015e989 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -271,7 +271,13 @@
        status = "reserved";
 };
 
+&mcu_uart0 {
+       status = "okay";
+       /* Default pinmux */
+};
+
 &main_uart0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_uart0_pins_default>;
        power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;

diff --git a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
index d25e8b26187f9361107001a8af172f87a3d99081..0f67e1ec0fb86729c9bc157b27bad232b863c4a5 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
@@ -50,7 +50,3 @@
        ti,driver-strength-ohm = <50>;
        disable-wp;
 };
-
-&main_uart0 {
-       status = "disabled";
-};