Commit c4574aa0 authored by Olof Johansson's avatar Olof Johansson Committed by Thierry Reding

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: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 121a2f6d
...@@ -15,6 +15,7 @@ / { ...@@ -15,6 +15,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps65913@58"; rtc0 = "/i2c@7000d000/tps65913@58";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uartd;
}; };
memory { memory {
......
...@@ -15,6 +15,10 @@ chosen { ...@@ -15,6 +15,10 @@ chosen {
linux,initrd-end = <0x82800000>; linux,initrd-end = <0x82800000>;
}; };
aliases {
serial0 = &uartd;
};
firmware { firmware {
trusted-foundations { trusted-foundations {
compatible = "tlm,trusted-foundations"; compatible = "tlm,trusted-foundations";
......
...@@ -15,6 +15,10 @@ chosen { ...@@ -15,6 +15,10 @@ chosen {
linux,initrd-end = <0x82800000>; linux,initrd-end = <0x82800000>;
}; };
aliases {
serial0 = &uartd;
};
firmware { firmware {
trusted-foundations { trusted-foundations {
compatible = "tlm,trusted-foundations"; compatible = "tlm,trusted-foundations";
......
...@@ -9,13 +9,6 @@ / { ...@@ -9,13 +9,6 @@ / {
compatible = "nvidia,tegra114"; compatible = "nvidia,tegra114";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
aliases {
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
};
host1x@50000000 { host1x@50000000 {
compatible = "nvidia,tegra114-host1x", "simple-bus"; compatible = "nvidia,tegra114-host1x", "simple-bus";
reg = <0x50000000 0x00028000>; reg = <0x50000000 0x00028000>;
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@0,7000d000/pmic@40"; rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000"; rtc1 = "/rtc@0,7000e000";
serial0 = &uartd;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@0,7000d000/pmic@40"; rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000"; rtc1 = "/rtc@0,7000e000";
serial0 = &uarta;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@0,7000d000/pmic@40"; rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000"; rtc1 = "/rtc@0,7000e000";
serial0 = &uarta;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps6586x@34"; rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uartd;
}; };
memory { memory {
......
...@@ -6,6 +6,11 @@ / { ...@@ -6,6 +6,11 @@ / {
model = "Toradex Colibri T20 512MB on Iris"; model = "Toradex Colibri T20 512MB on Iris";
compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20"; compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20";
aliases {
serial0 = &uarta;
serial1 = &uartd;
};
host1x@50000000 { host1x@50000000 {
hdmi@54280000 { hdmi@54280000 {
status = "okay"; status = "okay";
......
...@@ -6,6 +6,10 @@ / { ...@@ -6,6 +6,10 @@ / {
model = "Avionic Design Medcom-Wide board"; model = "Avionic Design Medcom-Wide board";
compatible = "ad,medcom-wide", "ad,tamonten", "nvidia,tegra20"; compatible = "ad,medcom-wide", "ad,tamonten", "nvidia,tegra20";
aliases {
serial0 = &uartd;
};
pwm@7000a000 { pwm@7000a000 {
status = "okay"; status = "okay";
}; };
......
...@@ -10,6 +10,8 @@ / { ...@@ -10,6 +10,8 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps6586x@34"; rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uarta;
serial1 = &uartc;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps6586x@34"; rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uartd;
}; };
memory { memory {
......
...@@ -7,6 +7,7 @@ / { ...@@ -7,6 +7,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps6586x@34"; rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uartd;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000c500/rtc@56"; rtc0 = "/i2c@7000c500/rtc@56";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uarta;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps6586x@34"; rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uartd;
}; };
memory { memory {
......
...@@ -10,6 +10,7 @@ / { ...@@ -10,6 +10,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/max8907@3c"; rtc0 = "/i2c@7000d000/max8907@3c";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uarta;
}; };
memory { memory {
......
...@@ -9,14 +9,6 @@ / { ...@@ -9,14 +9,6 @@ / {
compatible = "nvidia,tegra20"; compatible = "nvidia,tegra20";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
aliases {
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
serial4 = &uarte;
};
host1x@50000000 { host1x@50000000 {
compatible = "nvidia,tegra20-host1x", "simple-bus"; compatible = "nvidia,tegra20-host1x", "simple-bus";
reg = <0x50000000 0x00024000>; reg = <0x50000000 0x00024000>;
......
...@@ -11,6 +11,10 @@ aliases { ...@@ -11,6 +11,10 @@ aliases {
rtc0 = "/i2c@7000c000/rtc@68"; rtc0 = "/i2c@7000c000/rtc@68";
rtc1 = "/i2c@7000d000/tps65911@2d"; rtc1 = "/i2c@7000d000/tps65911@2d";
rtc2 = "/rtc@7000e000"; rtc2 = "/rtc@7000e000";
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
}; };
pcie-controller@00003000 { pcie-controller@00003000 {
......
...@@ -9,6 +9,7 @@ / { ...@@ -9,6 +9,7 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps65911@2d"; rtc0 = "/i2c@7000d000/tps65911@2d";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uarta;
}; };
memory { memory {
......
...@@ -30,6 +30,8 @@ / { ...@@ -30,6 +30,8 @@ / {
aliases { aliases {
rtc0 = "/i2c@7000d000/tps65911@2d"; rtc0 = "/i2c@7000d000/tps65911@2d";
rtc1 = "/rtc@7000e000"; rtc1 = "/rtc@7000e000";
serial0 = &uarta;
serial1 = &uartc;
}; };
memory { memory {
......
...@@ -10,6 +10,9 @@ aliases { ...@@ -10,6 +10,9 @@ aliases {
rtc0 = "/i2c@7000c000/rtc@68"; rtc0 = "/i2c@7000c000/rtc@68";
rtc1 = "/i2c@7000d000/tps65911@2d"; rtc1 = "/i2c@7000d000/tps65911@2d";
rtc2 = "/rtc@7000e000"; rtc2 = "/rtc@7000e000";
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartd;
}; };
host1x@50000000 { host1x@50000000 {
......
...@@ -9,14 +9,6 @@ / { ...@@ -9,14 +9,6 @@ / {
compatible = "nvidia,tegra30"; compatible = "nvidia,tegra30";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
aliases {
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
serial4 = &uarte;
};
pcie-controller@00003000 { pcie-controller@00003000 {
compatible = "nvidia,tegra30-pcie"; compatible = "nvidia,tegra30-pcie";
device_type = "pci"; device_type = "pci";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment