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

UART nodes defined in the top-level AM64x SoC dtsi files are incomplete
and will 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>
Reviewed-by: Bryan Brattlof <bb@ti.com>
Acked-by: Vignesh Raghavendra <vigneshr@ti.com>
Link: https://lore.kernel.org/r/20221017192532.23825-2-afd@ti.com

diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
index d6aa23681bbe51d9b624c5473e9b2cc766c079ed..a115c668d00102945ad5a04b2bdcf9e9f5a83eb3 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
@@ -237,6 +237,7 @@
                power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 146 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_uart1: serial@2810000 {
@@ -248,6 +249,7 @@
                power-domains = <&k3_pds 152 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 152 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_uart2: serial@2820000 {
@@ -259,6 +261,7 @@
                power-domains = <&k3_pds 153 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 153 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_uart3: serial@2830000 {
@@ -270,6 +273,7 @@
                power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 154 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_uart4: serial@2840000 {
@@ -281,6 +285,7 @@
                power-domains = <&k3_pds 155 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 155 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_uart5: serial@2850000 {
@@ -292,6 +297,7 @@
                power-domains = <&k3_pds 156 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 156 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_uart6: serial@2860000 {
@@ -303,6 +309,7 @@
                power-domains = <&k3_pds 158 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 158 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        main_i2c0: i2c@20000000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
index 02d4285acbb8d7c3d1d8462334d358758e5f7501..1181ad0176261dc77e3b95f2e37eec206e282d36 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi
@@ -14,6 +14,7 @@
                power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 149 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        mcu_uart1: serial@4a10000 {
@@ -24,6 +25,7 @@
                power-domains = <&k3_pds 160 TI_SCI_PD_EXCLUSIVE>;
                clocks = <&k3_clks 160 0>;
                clock-names = "fclk";
+               status = "disabled";
        };
 
        mcu_i2c0: i2c@4900000 {

diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index 5cf913860f800e1415b79b73c9dc1a1aedf5472e..78f246077ca99a22101056f8ab69ff40e9ce02d1 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -325,6 +325,7 @@
 };
 
 &main_uart0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_uart0_pins_default>;
 };
@@ -334,34 +335,6 @@
        status = "reserved";
 };
 
-&main_uart2 {
-       status = "disabled";
-};
-
-&main_uart3 {
-       status = "disabled";
-};
-
-&main_uart4 {
-       status = "disabled";
-};
-
-&main_uart5 {
-       status = "disabled";
-};
-
-&main_uart6 {
-       status = "disabled";
-};
-
-&mcu_uart0 {
-       status = "disabled";
-};
-
-&mcu_uart1 {
-       status = "disabled";
-};
-
 &main_i2c1 {
        pinctrl-names = "default";
        pinctrl-0 = <&main_i2c1_pins_default>;

diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
index 738d0cf6c40ac9b44d597d97d22e0d2067be503f..8423295150fc4fd5754ee3876a4969c4bbfd35c9 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
@@ -338,15 +338,8 @@
        };
 };
 
-&mcu_uart0 {
-       status = "disabled";
-};
-
-&mcu_uart1 {
-       status = "disabled";
-};
-
 &main_uart0 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_uart0_pins_default>;
 };
@@ -356,26 +349,6 @@
        status = "reserved";
 };
 
-&main_uart2 {
-       status = "disabled";
-};
-
-&main_uart3 {
-       status = "disabled";
-};
-
-&main_uart4 {
-       status = "disabled";
-};
-
-&main_uart5 {
-       status = "disabled";
-};
-
-&main_uart6 {
-       status = "disabled";
-};
-
 &mcu_i2c0 {
        status = "disabled";
 };