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

UART nodes defined in the top-level J721s2 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>
Reviewed-by: Bryan Brattlof <bb@ti.com>
Link: https://lore.kernel.org/r/20221020160305.18711-8-afd@ti.com

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 b210cc07c539539907ea2e538f41a6ac5503d8bf..9f1a0ca4dc372412749943240e365fb78a3f0fe3 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
@@ -219,49 +219,19 @@
        status = "reserved";
 };
 
-&main_uart0 {
-       status = "disabled";
-};
-
-&main_uart1 {
-       status = "disabled";
-};
-
-&main_uart2 {
-       status = "disabled";
-};
-
-&main_uart3 {
-       status = "disabled";
-};
-
-&main_uart4 {
-       status = "disabled";
-};
-
-&main_uart5 {
-       status = "disabled";
-};
-
-&main_uart6 {
-       status = "disabled";
-};
-
-&main_uart7 {
-       status = "disabled";
+&mcu_uart0 {
+       status = "okay";
+       /* Default pinmux */
 };
 
 &main_uart8 {
+       status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&main_uart8_pins_default>;
        /* Shared with TFA on this platform */
        power-domains = <&k3_pds 357 TI_SCI_PD_SHARED>;
 };
 
-&main_uart9 {
-       status = "disabled";
-};
-
 &main_i2c0 {
        clock-frequency = <400000>;
 

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
index 34e7d577ae13b3deb474844bd023414c8b975554..7267a7b665ce868d744f08a4def2618608ad4b7e 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
@@ -80,6 +80,7 @@
                clocks = <&k3_clks 146 3>;
                clock-names = "fclk";
                power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_uart1: serial@2810000 {
@@ -90,6 +91,7 @@
                clocks = <&k3_clks 350 3>;
                clock-names = "fclk";
                power-domains = <&k3_pds 350 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_uart2: serial@2820000 {
@@ -100,6 +102,7 @@
                clocks = <&k3_clks 351 3>;
                clock-names = "fclk";
                power-domains = <&k3_pds 351 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_uart3: serial@2830000 {
@@ -110,6 +113,7 @@
                clocks = <&k3_clks 352 3>;
                clock-names = "fclk";
                power-domains = <&k3_pds 352 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_uart4: serial@2840000 {
@@ -120,6 +124,7 @@
                clocks = <&k3_clks 353 3>;
                clock-names = "fclk";
                power-domains = <&k3_pds 353 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_uart5: serial@2850000 {
@@ -130,6 +135,7 @@
                clocks = <&k3_clks 354 3>;
                clock-names = "fclk";
                power-domains = <&k3_pds 354 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_uart6: serial@2860000 {
@@ -140,6 +146,7 @@
                clocks = <&k3_clks 355 3>;
                clock-names = "fclk";
                power-domains = <&k3_pds 355 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_uart7: serial@2870000 {
@@ -150,6 +157,7 @@
                clocks = <&k3_clks 356 3>;
                clock-names = "fclk";
                power-domains = <&k3_pds 356 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_uart8: serial@2880000 {
@@ -160,6 +168,7 @@
                clocks = <&k3_clks 357 3>;
                clock-names = "fclk";
                power-domains = <&k3_pds 357 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_uart9: serial@2890000 {
@@ -170,6 +179,7 @@
                clocks = <&k3_clks 358 3>;
                clock-names = "fclk";
                power-domains = <&k3_pds 358 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        main_gpio0: gpio@600000 {

diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
index 4d1bfabd1313a560471436110998fc3927e4be88..3de4218e8e125aff59a65e79bf61b6b029b97731 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
@@ -91,6 +91,7 @@
                clocks = <&k3_clks 359 3>;
                clock-names = "fclk";
                power-domains = <&k3_pds 359 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        mcu_uart0: serial@40a00000 {
@@ -101,6 +102,7 @@
                clocks = <&k3_clks 149 3>;
                clock-names = "fclk";
                power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;
+               status = "disabled";
        };
 
        wkup_gpio0: gpio@42110000 {