Skip to content

Commit

Permalink
arm64: dts: ti: k3-j721e: Enable UART nodes at the board level
Browse files Browse the repository at this point in the history
UART nodes defined in the top-level J721e 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 <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>
Reviewed-by: Bryan Brattlof <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
glneo authored and nmenon committed Oct 28, 2022
1 parent b0ca32e commit fe17e20
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 57 deletions.
40 changes: 16 additions & 24 deletions arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
Original file line number Diff line number Diff line change
Expand Up @@ -370,38 +370,30 @@
status = "reserved";
};

&main_uart0 {
power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
};

&main_uart3 {
/* UART not brought out */
status = "disabled";
};

&main_uart5 {
/* UART not brought out */
status = "disabled";
&mcu_uart0 {
status = "okay";
/* Default pinmux */
};

&main_uart6 {
/* UART not brought out */
status = "disabled";
&main_uart0 {
status = "okay";
/* Shared with ATF on this platform */
power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
};

&main_uart7 {
/* UART not brought out */
status = "disabled";
&main_uart1 {
status = "okay";
/* Default pinmux */
};

&main_uart8 {
/* UART not brought out */
status = "disabled";
&main_uart2 {
status = "okay";
/* Default pinmux */
};

&main_uart9 {
/* UART not brought out */
status = "disabled";
&main_uart4 {
status = "okay";
/* Default pinmux */
};

&main_gpio2 {
Expand Down
10 changes: 10 additions & 0 deletions arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -840,6 +840,7 @@
power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 146 0>;
clock-names = "fclk";
status = "disabled";
};

main_uart1: serial@2810000 {
Expand All @@ -851,6 +852,7 @@
power-domains = <&k3_pds 278 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 278 0>;
clock-names = "fclk";
status = "disabled";
};

main_uart2: serial@2820000 {
Expand All @@ -862,6 +864,7 @@
power-domains = <&k3_pds 279 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 279 0>;
clock-names = "fclk";
status = "disabled";
};

main_uart3: serial@2830000 {
Expand All @@ -873,6 +876,7 @@
power-domains = <&k3_pds 280 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 280 0>;
clock-names = "fclk";
status = "disabled";
};

main_uart4: serial@2840000 {
Expand All @@ -884,6 +888,7 @@
power-domains = <&k3_pds 281 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 281 0>;
clock-names = "fclk";
status = "disabled";
};

main_uart5: serial@2850000 {
Expand All @@ -895,6 +900,7 @@
power-domains = <&k3_pds 282 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 282 0>;
clock-names = "fclk";
status = "disabled";
};

main_uart6: serial@2860000 {
Expand All @@ -906,6 +912,7 @@
power-domains = <&k3_pds 283 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 283 0>;
clock-names = "fclk";
status = "disabled";
};

main_uart7: serial@2870000 {
Expand All @@ -917,6 +924,7 @@
power-domains = <&k3_pds 284 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 284 0>;
clock-names = "fclk";
status = "disabled";
};

main_uart8: serial@2880000 {
Expand All @@ -928,6 +936,7 @@
power-domains = <&k3_pds 285 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 285 0>;
clock-names = "fclk";
status = "disabled";
};

main_uart9: serial@2890000 {
Expand All @@ -939,6 +948,7 @@
power-domains = <&k3_pds 286 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 286 0>;
clock-names = "fclk";
status = "disabled";
};

main_gpio0: gpio@600000 {
Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
power-domains = <&k3_pds 287 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 287 0>;
clock-names = "fclk";
status = "disabled";
};

mcu_uart0: serial@40a00000 {
Expand All @@ -90,6 +91,7 @@
power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 149 0>;
clock-names = "fclk";
status = "disabled";
};

wkup_gpio_intr: interrupt-controller@42200000 {
Expand Down
42 changes: 9 additions & 33 deletions arch/arm64/boot/dts/ti/k3-j721e-sk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -475,46 +475,22 @@
status = "reserved";
};

&mcu_uart0 {
status = "okay";
/* Default pinmux */
};

&main_uart0 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&main_uart0_pins_default>;
/* Shared with ATF on this platform */
power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
};

&main_uart2 {
/* Brought out on RPi header */
status = "disabled";
};

&main_uart3 {
/* UART not brought out */
status = "disabled";
};

&main_uart5 {
/* UART not brought out */
status = "disabled";
};

&main_uart6 {
/* UART not brought out */
status = "disabled";
};

&main_uart7 {
/* UART not brought out */
status = "disabled";
};

&main_uart8 {
/* UART not brought out */
status = "disabled";
};

&main_uart9 {
/* Brought out on M.2 E Key */
status = "disabled";
&main_uart1 {
status = "okay";
/* Default pinmux */
};

&main_sdhci0 {
Expand Down

0 comments on commit fe17e20

Please sign in to comment.