Skip to content

Commit

Permalink
ARM: dts: tegra: move serial aliases to per-board
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Olof Johansson authored and Thierry Reding committed Nov 13, 2014
1 parent 121a2f6 commit c4574aa
Show file tree
Hide file tree
Showing 22 changed files with 39 additions and 23 deletions.
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra114-dalmore.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
aliases {
rtc0 = "/i2c@7000d000/tps65913@58";
rtc1 = "/rtc@7000e000";
serial0 = &uartd;
};

memory {
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/tegra114-roth.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
linux,initrd-end = <0x82800000>;
};

aliases {
serial0 = &uartd;
};

firmware {
trusted-foundations {
compatible = "tlm,trusted-foundations";
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/tegra114-tn7.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
linux,initrd-end = <0x82800000>;
};

aliases {
serial0 = &uartd;
};

firmware {
trusted-foundations {
compatible = "tlm,trusted-foundations";
Expand Down
7 changes: 0 additions & 7 deletions arch/arm/boot/dts/tegra114.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@
compatible = "nvidia,tegra114";
interrupt-parent = <&gic>;

aliases {
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
};

host1x@50000000 {
compatible = "nvidia,tegra114-host1x", "simple-bus";
reg = <0x50000000 0x00028000>;
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra124-jetson-tk1.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
aliases {
rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000";
serial0 = &uartd;
};

memory {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra124-nyan-big.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
aliases {
rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000";
serial0 = &uarta;
};

memory {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra124-venice2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
aliases {
rtc0 = "/i2c@0,7000d000/pmic@40";
rtc1 = "/rtc@0,7000e000";
serial0 = &uarta;
};

memory {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra20-harmony.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
aliases {
rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000";
serial0 = &uartd;
};

memory {
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/tegra20-iris-512.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
model = "Toradex Colibri T20 512MB on Iris";
compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20";

aliases {
serial0 = &uarta;
serial1 = &uartd;
};

host1x@50000000 {
hdmi@54280000 {
status = "okay";
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/tegra20-medcom-wide.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
model = "Avionic Design Medcom-Wide board";
compatible = "ad,medcom-wide", "ad,tamonten", "nvidia,tegra20";

aliases {
serial0 = &uartd;
};

pwm@7000a000 {
status = "okay";
};
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/tegra20-paz00.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
aliases {
rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000";
serial0 = &uarta;
serial1 = &uartc;
};

memory {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra20-seaboard.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
aliases {
rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000";
serial0 = &uartd;
};

memory {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra20-tamonten.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
aliases {
rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000";
serial0 = &uartd;
};

memory {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra20-trimslice.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
aliases {
rtc0 = "/i2c@7000c500/rtc@56";
rtc1 = "/rtc@7000e000";
serial0 = &uarta;
};

memory {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra20-ventana.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
aliases {
rtc0 = "/i2c@7000d000/tps6586x@34";
rtc1 = "/rtc@7000e000";
serial0 = &uartd;
};

memory {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra20-whistler.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
aliases {
rtc0 = "/i2c@7000d000/max8907@3c";
rtc1 = "/rtc@7000e000";
serial0 = &uarta;
};

memory {
Expand Down
8 changes: 0 additions & 8 deletions arch/arm/boot/dts/tegra20.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@
compatible = "nvidia,tegra20";
interrupt-parent = <&intc>;

aliases {
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
serial4 = &uarte;
};

host1x@50000000 {
compatible = "nvidia,tegra20-host1x", "simple-bus";
reg = <0x50000000 0x00024000>;
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/tegra30-apalis-eval.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
rtc0 = "/i2c@7000c000/rtc@68";
rtc1 = "/i2c@7000d000/tps65911@2d";
rtc2 = "/rtc@7000e000";
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
};

pcie-controller@00003000 {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/tegra30-beaver.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
aliases {
rtc0 = "/i2c@7000d000/tps65911@2d";
rtc1 = "/rtc@7000e000";
serial0 = &uarta;
};

memory {
Expand Down
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/tegra30-cardhu.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
aliases {
rtc0 = "/i2c@7000d000/tps65911@2d";
rtc1 = "/rtc@7000e000";
serial0 = &uarta;
serial1 = &uartc;
};

memory {
Expand Down
3 changes: 3 additions & 0 deletions arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
rtc0 = "/i2c@7000c000/rtc@68";
rtc1 = "/i2c@7000d000/tps65911@2d";
rtc2 = "/rtc@7000e000";
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartd;
};

host1x@50000000 {
Expand Down
8 changes: 0 additions & 8 deletions arch/arm/boot/dts/tegra30.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@
compatible = "nvidia,tegra30";
interrupt-parent = <&intc>;

aliases {
serial0 = &uarta;
serial1 = &uartb;
serial2 = &uartc;
serial3 = &uartd;
serial4 = &uarte;
};

pcie-controller@00003000 {
compatible = "nvidia,tegra30-pcie";
device_type = "pci";
Expand Down

0 comments on commit c4574aa

Please sign in to comment.