arm64: tegra: enable same UARTs for Orin NX/Nano

This patch ensures that Orin NX and Orin Nano enable an identical
set of serial ports. UARTA/UARTE will be enabled by adding
respective nodes to the board dtsi file.

Signed-off-by: Vedant Deshpande <vedantd@nvidia.com>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts b/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts
index 82a59e33c46c9b9f4cf6f1913d0205edcdbbd7a9..5dc974bb360cd3c8862ad6344e8826a64cee6015 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts
@@ -7,24 +7,7 @@
        compatible = "nvidia,p3768-0000+p3767-0000", "nvidia,p3767-0000", "nvidia,tegra234";
        model = "NVIDIA Jetson Orin NX Engineering Reference Developer Kit";
 
-       aliases {
-               serial1 = &uarta;
-               serial2 = &uarte;
-       };
-
        bus@0 {
-               serial@3100000 {
-                       compatible = "nvidia,tegra194-hsuart";
-                       reset-names = "serial";
-                       status = "okay";
-               };
-
-               serial@3140000 {
-                       compatible = "nvidia,tegra194-hsuart";
-                       reset-names = "serial";
-                       status = "okay";
-               };
-
                hda@3510000 {
                        nvidia,model = "NVIDIA Jetson Orin NX HDA";
                };

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767.dtsi b/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767.dtsi
index 6d64a24fa2519354bed481a5d4427342f2d84beb..81d4f4f12ab129422e4573955a3d0c193075d6ab 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767.dtsi
@@ -9,6 +9,8 @@
 
        aliases {
                serial0 = &tcu;
+               serial1 = &uarta;
+               serial2 = &uarte;
        };
 
        chosen {
@@ -16,6 +18,18 @@
        };
 
        bus@0 {
+               serial@3100000 {
+                       compatible = "nvidia,tegra194-hsuart";
+                       reset-names = "serial";
+                       status = "okay";
+               };
+
+               serial@3140000 {
+                       compatible = "nvidia,tegra194-hsuart";
+                       reset-names = "serial";
+                       status = "okay";
+               };
+
                i2c@3160000 {
                        status = "okay";