iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Olof Johansson 2014-11-11 12:49:30 -08:00 committed by Thierry Reding
parent 121a2f6d5f
commit c4574aa00e
22 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/tegra114-dalmore.dts
View File

@ -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 {

4
arch/arm/boot/dts/tegra114-roth.dts
View File

@ -15,6 +15,10 @@
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";

4
arch/arm/boot/dts/tegra114-tn7.dts
View File

@ -15,6 +15,10 @@
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";

7
arch/arm/boot/dts/tegra114.dtsi
View File

@ -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>;

1
arch/arm/boot/dts/tegra124-jetson-tk1.dts
View File

@ -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 {

1
arch/arm/boot/dts/tegra124-nyan-big.dts
View File

@ -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 {

1
arch/arm/boot/dts/tegra124-venice2.dts
View File

@ -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 {

1
arch/arm/boot/dts/tegra20-harmony.dts
View File

@ -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 {

5
arch/arm/boot/dts/tegra20-iris-512.dts
View File

@ -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";

4
arch/arm/boot/dts/tegra20-medcom-wide.dts
View File

@ -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";
}; };

2
arch/arm/boot/dts/tegra20-paz00.dts
View File

@ -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 {

1
arch/arm/boot/dts/tegra20-seaboard.dts
View File

@ -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 {

1
arch/arm/boot/dts/tegra20-tamonten.dtsi
View File

@ -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 {

1
arch/arm/boot/dts/tegra20-trimslice.dts
View File

@ -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 {

1
arch/arm/boot/dts/tegra20-ventana.dts
View File

@ -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 {

1
arch/arm/boot/dts/tegra20-whistler.dts
View File

@ -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 {

8
arch/arm/boot/dts/tegra20.dtsi
View File

@ -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>;

4
arch/arm/boot/dts/tegra30-apalis-eval.dts
View File

@ -11,6 +11,10 @@
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 {

1
arch/arm/boot/dts/tegra30-beaver.dts
View File

@ -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 {

2
arch/arm/boot/dts/tegra30-cardhu.dtsi
View File

@ -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 {

3
arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
View File

@ -10,6 +10,9 @@
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 {

8
arch/arm/boot/dts/tegra30.dtsi
View File

@ -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";