ARM: dts: tegra: move serial aliases to per-board

There are general changes pending to make the /aliases/serial* entries
number the serial ports on the system. On Tegra, so far the ports have
been just numbered dynamically as they are configured so that makes them
change.

To avoid this, add specific aliases per board to keep the old numbers.
This allows us to change the numbering by default on future SoCs while
keeping the numbering on existing boards.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index 5c21d21..8b7aa0d 100644 (file)
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -15,6 +15,7 @@
        aliases {
                rtc0 = "/i2c@7000d000/tps65913@58";
                rtc1 = "/rtc@7000e000";
+               serial0 = &uartd;
        };
 
        memory {

diff --git a/arch/arm/boot/dts/tegra114-roth.dts b/arch/arm/boot/dts/tegra114-roth.dts
index c7c6825..a80f1e2 100644 (file)
--- a/arch/arm/boot/dts/tegra114-roth.dts
+++ b/arch/arm/boot/dts/tegra114-roth.dts
@@ -15,6 +15,10 @@
                linux,initrd-end = <0x82800000>;
        };
 
+       aliases {
+               serial0 = &uartd;
+       };
+
        firmware {
                trusted-foundations {
                        compatible = "tlm,trusted-foundations";

diff --git a/arch/arm/boot/dts/tegra114-tn7.dts b/arch/arm/boot/dts/tegra114-tn7.dts
index 9636621..2301c66 100644 (file)
--- a/arch/arm/boot/dts/tegra114-tn7.dts
+++ b/arch/arm/boot/dts/tegra114-tn7.dts
@@ -15,6 +15,10 @@
                linux,initrd-end = <0x82800000>;
        };
 
+       aliases {
+               serial0 = &uartd;
+       };
+
        firmware {
                trusted-foundations {
                        compatible = "tlm,trusted-foundations";

diff --cc arch/arm/boot/dts/tegra114.dtsi
Simple merge

diff --cc arch/arm/boot/dts/tegra124-jetson-tk1.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra124-nyan-big.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra124-venice2.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra20-harmony.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra20-iris-512.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra20-medcom-wide.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra20-paz00.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra20-seaboard.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra20-tamonten.dtsi
Simple merge

diff --cc arch/arm/boot/dts/tegra20-trimslice.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra20-ventana.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra20-whistler.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra20.dtsi
Simple merge

diff --cc arch/arm/boot/dts/tegra30-apalis-eval.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra30-beaver.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra30-cardhu.dtsi
Simple merge

diff --cc arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
Simple merge

diff --cc arch/arm/boot/dts/tegra30.dtsi
Simple merge