aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/tegra20-paz00.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-11-19 11:35:30 -0500
committerArnd Bergmann <arnd@arndb.de>2014-11-19 11:35:30 -0500
commit4a8ab7713bcc8504228784b7796ae6d5089acd66 (patch)
tree9e90191791d54e1e8511f3dfef817af798e6f777 /arch/arm/boot/dts/tegra20-paz00.dts
parent5210436b8180bf406cdc9c85ed09a46bccfd6e64 (diff)
parent221b9bf42b26a22e6904d20f35c53aec2e73a646 (diff)
Merge tag 'tegra-for-3.18-fixes-for-rc5' of git://git.kernel.org/pub/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>
Diffstat (limited to 'arch/arm/boot/dts/tegra20-paz00.dts')
-rw-r--r--arch/arm/boot/dts/tegra20-paz00.dts2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index d4438e30de45..ed7e1009326c 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -10,6 +10,8 @@
10 aliases { 10 aliases {
11 rtc0 = "/i2c@7000d000/tps6586x@34"; 11 rtc0 = "/i2c@7000d000/tps6586x@34";
12 rtc1 = "/rtc@7000e000"; 12 rtc1 = "/rtc@7000e000";
13 serial0 = &uarta;
14 serial1 = &uartc;
13 }; 15 };
14 16
15 memory { 17 memory {