Skip to content

Commit

Permalink
Merge tag 'tegra-for-3.18-fixes-for-rc5' of git://git.kernel.org/pub/…
Browse files Browse the repository at this point in the history 
…scm/linux/kernel/git/tegra/linux into fixes

Pull "ARM: tegra: Device tree fixes for v3.18-rc5" from Thierry Reding:

This contains the serial port numbering fixes that are required for the
serial port numbering to stay the same with or without the serial core
making use of the aliases defined in DT.

eMMC is also fixed for TN7 and Roth boards which were using the wrong
regulators.

* tag 'tegra-for-3.18-fixes-for-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: roth: Fix SD card VDD_IO regulator
  ARM: tegra: Remove eMMC vmmc property for roth/tn7
  ARM: dts: tegra: move serial aliases to per-board
  ARM: tegra: Add serial port labels to Tegra124 DT

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Nov 19, 2014
2 parents 5210436 + 221b9bf commit 4a8ab77
Show file tree
Hide file tree
Showing 23 changed files with 44 additions and 32 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
9 changes: 5 additions & 4 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 Expand Up @@ -916,8 +920,6 @@
regulator-name = "vddio-sdmmc3";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
regulator-boot-on;
};

ldousb {
Expand Down Expand Up @@ -962,7 +964,7 @@
sdhci@78000400 {
status = "okay";
bus-width = <4>;
vmmc-supply = <&vddio_sdmmc3>;
vqmmc-supply = <&vddio_sdmmc3>;
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
power-gpios = <&gpio TEGRA_GPIO(H, 0) GPIO_ACTIVE_HIGH>;
};
Expand All @@ -971,7 +973,6 @@
sdhci@78000600 {
status = "okay";
bus-width = <8>;
vmmc-supply = <&vdd_1v8>;
non-removable;
};

Expand Down
5 changes: 4 additions & 1 deletion 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 Expand Up @@ -240,7 +244,6 @@
sdhci@78000600 {
status = "okay";
bus-width = <8>;
vmmc-supply = <&vdd_1v8>;
non-removable;
};

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
8 changes: 4 additions & 4 deletions arch/arm/boot/dts/tegra124.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
* the APB DMA based serial driver, the comptible is
* "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart".
*/
serial@0,70006000 {
uarta: serial@0,70006000 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006000 0x0 0x40>;
reg-shift = <2>;
Expand All @@ -299,7 +299,7 @@
status = "disabled";
};

serial@0,70006040 {
uartb: serial@0,70006040 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006040 0x0 0x40>;
reg-shift = <2>;
Expand All @@ -312,7 +312,7 @@
status = "disabled";
};

serial@0,70006200 {
uartc: serial@0,70006200 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006200 0x0 0x40>;
reg-shift = <2>;
Expand All @@ -325,7 +325,7 @@
status = "disabled";
};

serial@0,70006300 {
uartd: serial@0,70006300 {
compatible = "nvidia,tegra124-uart", "nvidia,tegra20-uart";
reg = <0x0 0x70006300 0x0 0x40>;
reg-shift = <2>;
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 4a8ab77

Please sign in to comment.