Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit c4574aa00e7c144ae4d1bfc2388433d9eb82e4d3

Authored by Olof Johansson
Committed by Thierry Reding
1 parent 121a2f6d5f
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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>

Showing 22 changed files with 39 additions and 23 deletions Side-by-side Diff

arch/arm/boot/dts/tegra114-dalmore.dts
Diff comments   View file @ c4574aa
... ... @@ -15,6 +15,7 @@
15 15 aliases {
16 16 rtc0 = "/i2c@7000d000/tps65913@58";
17 17 rtc1 = "/rtc@7000e000";
  18 + serial0 = &uartd;
18 19 };
19 20  
20 21 memory {
arch/arm/boot/dts/tegra114-roth.dts
Diff comments   View file @ c4574aa
... ... @@ -15,6 +15,10 @@
15 15 linux,initrd-end = <0x82800000>;
16 16 };
17 17  
  18 + aliases {
  19 + serial0 = &uartd;
  20 + };
  21 +
18 22 firmware {
19 23 trusted-foundations {
20 24 compatible = "tlm,trusted-foundations";
arch/arm/boot/dts/tegra114-tn7.dts
Diff comments   View file @ c4574aa
... ... @@ -15,6 +15,10 @@
15 15 linux,initrd-end = <0x82800000>;
16 16 };
17 17  
  18 + aliases {
  19 + serial0 = &uartd;
  20 + };
  21 +
18 22 firmware {
19 23 trusted-foundations {
20 24 compatible = "tlm,trusted-foundations";
arch/arm/boot/dts/tegra114.dtsi
Diff comments   View file @ c4574aa
... ... @@ -9,13 +9,6 @@
9 9 compatible = "nvidia,tegra114";
10 10 interrupt-parent = <&gic>;
11 11  
12   - aliases {
13   - serial0 = &uarta;
14   - serial1 = &uartb;
15   - serial2 = &uartc;
16   - serial3 = &uartd;
17   - };
18   -
19 12 host1x@50000000 {
20 13 compatible = "nvidia,tegra114-host1x", "simple-bus";
21 14 reg = <0x50000000 0x00028000>;
arch/arm/boot/dts/tegra124-jetson-tk1.dts
Diff comments   View file @ c4574aa
... ... @@ -10,6 +10,7 @@
10 10 aliases {
11 11 rtc0 = "/i2c@0,7000d000/pmic@40";
12 12 rtc1 = "/rtc@0,7000e000";
  13 + serial0 = &uartd;
13 14 };
14 15  
15 16 memory {
arch/arm/boot/dts/tegra124-nyan-big.dts
Diff comments   View file @ c4574aa
... ... @@ -10,6 +10,7 @@
10 10 aliases {
11 11 rtc0 = "/i2c@0,7000d000/pmic@40";
12 12 rtc1 = "/rtc@0,7000e000";
  13 + serial0 = &uarta;
13 14 };
14 15  
15 16 memory {
arch/arm/boot/dts/tegra124-venice2.dts
Diff comments   View file @ c4574aa
... ... @@ -10,6 +10,7 @@
10 10 aliases {
11 11 rtc0 = "/i2c@0,7000d000/pmic@40";
12 12 rtc1 = "/rtc@0,7000e000";
  13 + serial0 = &uarta;
13 14 };
14 15  
15 16 memory {
arch/arm/boot/dts/tegra20-harmony.dts
Diff comments   View file @ c4574aa
... ... @@ -10,6 +10,7 @@
10 10 aliases {
11 11 rtc0 = "/i2c@7000d000/tps6586x@34";
12 12 rtc1 = "/rtc@7000e000";
  13 + serial0 = &uartd;
13 14 };
14 15  
15 16 memory {
arch/arm/boot/dts/tegra20-iris-512.dts
Diff comments   View file @ c4574aa
... ... @@ -6,6 +6,11 @@
6 6 model = "Toradex Colibri T20 512MB on Iris";
7 7 compatible = "toradex,iris", "toradex,colibri_t20-512", "nvidia,tegra20";
8 8  
  9 + aliases {
  10 + serial0 = &uarta;
  11 + serial1 = &uartd;
  12 + };
  13 +
9 14 host1x@50000000 {
10 15 hdmi@54280000 {
11 16 status = "okay";
arch/arm/boot/dts/tegra20-medcom-wide.dts
Diff comments   View file @ c4574aa
... ... @@ -6,6 +6,10 @@
6 6 model = "Avionic Design Medcom-Wide board";
7 7 compatible = "ad,medcom-wide", "ad,tamonten", "nvidia,tegra20";
8 8  
  9 + aliases {
  10 + serial0 = &uartd;
  11 + };
  12 +
9 13 pwm@7000a000 {
10 14 status = "okay";
11 15 };
arch/arm/boot/dts/tegra20-paz00.dts
Diff comments   View file @ c4574aa
... ... @@ -10,6 +10,8 @@
10 10 aliases {
11 11 rtc0 = "/i2c@7000d000/tps6586x@34";
12 12 rtc1 = "/rtc@7000e000";
  13 + serial0 = &uarta;
  14 + serial1 = &uartc;
13 15 };
14 16  
15 17 memory {
arch/arm/boot/dts/tegra20-seaboard.dts
Diff comments   View file @ c4574aa
... ... @@ -10,6 +10,7 @@
10 10 aliases {
11 11 rtc0 = "/i2c@7000d000/tps6586x@34";
12 12 rtc1 = "/rtc@7000e000";
  13 + serial0 = &uartd;
13 14 };
14 15  
15 16 memory {
arch/arm/boot/dts/tegra20-tamonten.dtsi
Diff comments   View file @ c4574aa
... ... @@ -7,6 +7,7 @@
7 7 aliases {
8 8 rtc0 = "/i2c@7000d000/tps6586x@34";
9 9 rtc1 = "/rtc@7000e000";
  10 + serial0 = &uartd;
10 11 };
11 12  
12 13 memory {
arch/arm/boot/dts/tegra20-trimslice.dts
Diff comments   View file @ c4574aa
... ... @@ -10,6 +10,7 @@
10 10 aliases {
11 11 rtc0 = "/i2c@7000c500/rtc@56";
12 12 rtc1 = "/rtc@7000e000";
  13 + serial0 = &uarta;
13 14 };
14 15  
15 16 memory {
arch/arm/boot/dts/tegra20-ventana.dts
Diff comments   View file @ c4574aa
... ... @@ -10,6 +10,7 @@
10 10 aliases {
11 11 rtc0 = "/i2c@7000d000/tps6586x@34";
12 12 rtc1 = "/rtc@7000e000";
  13 + serial0 = &uartd;
13 14 };
14 15  
15 16 memory {
arch/arm/boot/dts/tegra20-whistler.dts
Diff comments   View file @ c4574aa
... ... @@ -10,6 +10,7 @@
10 10 aliases {
11 11 rtc0 = "/i2c@7000d000/max8907@3c";
12 12 rtc1 = "/rtc@7000e000";
  13 + serial0 = &uarta;
13 14 };
14 15  
15 16 memory {
arch/arm/boot/dts/tegra20.dtsi
Diff comments   View file @ c4574aa
... ... @@ -9,14 +9,6 @@
9 9 compatible = "nvidia,tegra20";
10 10 interrupt-parent = <&intc>;
11 11  
12   - aliases {
13   - serial0 = &uarta;
14   - serial1 = &uartb;
15   - serial2 = &uartc;
16   - serial3 = &uartd;
17   - serial4 = &uarte;
18   - };
19   -
20 12 host1x@50000000 {
21 13 compatible = "nvidia,tegra20-host1x", "simple-bus";
22 14 reg = <0x50000000 0x00024000>;
arch/arm/boot/dts/tegra30-apalis-eval.dts
Diff comments   View file @ c4574aa
... ... @@ -11,6 +11,10 @@
11 11 rtc0 = "/i2c@7000c000/rtc@68";
12 12 rtc1 = "/i2c@7000d000/tps65911@2d";
13 13 rtc2 = "/rtc@7000e000";
  14 + serial0 = &uarta;
  15 + serial1 = &uartb;
  16 + serial2 = &uartc;
  17 + serial3 = &uartd;
14 18 };
15 19  
16 20 pcie-controller@00003000 {
arch/arm/boot/dts/tegra30-beaver.dts
Diff comments   View file @ c4574aa
... ... @@ -9,6 +9,7 @@
9 9 aliases {
10 10 rtc0 = "/i2c@7000d000/tps65911@2d";
11 11 rtc1 = "/rtc@7000e000";
  12 + serial0 = &uarta;
12 13 };
13 14  
14 15 memory {
arch/arm/boot/dts/tegra30-cardhu.dtsi
Diff comments   View file @ c4574aa
... ... @@ -30,6 +30,8 @@
30 30 aliases {
31 31 rtc0 = "/i2c@7000d000/tps65911@2d";
32 32 rtc1 = "/rtc@7000e000";
  33 + serial0 = &uarta;
  34 + serial1 = &uartc;
33 35 };
34 36  
35 37 memory {
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
Diff comments   View file @ c4574aa
... ... @@ -10,6 +10,9 @@
10 10 rtc0 = "/i2c@7000c000/rtc@68";
11 11 rtc1 = "/i2c@7000d000/tps65911@2d";
12 12 rtc2 = "/rtc@7000e000";
  13 + serial0 = &uarta;
  14 + serial1 = &uartb;
  15 + serial2 = &uartd;
13 16 };
14 17  
15 18 host1x@50000000 {
arch/arm/boot/dts/tegra30.dtsi
Diff comments   View file @ c4574aa
... ... @@ -9,14 +9,6 @@
9 9 compatible = "nvidia,tegra30";
10 10 interrupt-parent = <&intc>;
11 11  
12   - aliases {
13   - serial0 = &uarta;
14   - serial1 = &uartb;
15   - serial2 = &uartc;
16   - serial3 = &uartd;
17   - serial4 = &uarte;
18   - };
19   -
20 12 pcie-controller@00003000 {
21 13 compatible = "nvidia,tegra30-pcie";
22 14 device_type = "pci";