52 lines
1.7 KiB
Diff
52 lines
1.7 KiB
Diff
From b5c86b7496d74f6e454bcab5166efa023e1f0459 Mon Sep 17 00:00:00 2001
|
|
From: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
|
|
Date: Mon, 18 Jul 2016 11:46:48 +0200
|
|
Subject: [PATCH 1731/1791] ARM: tegra: fix erroneous address in dts
|
|
|
|
c90bb7b enabled the high speed UARTs of the Jetson TK1. Due to a merge
|
|
quirk, wrong addresses were introduced. Fix it and use the correct
|
|
addresses.
|
|
|
|
Thierry let me know, that there is another patch (b5896f67ab3c in
|
|
linux-next) in preparation which removes all the '0,' prefixes of unit
|
|
addresses on Tegra124 and is planned to go upstream in 4.8, so
|
|
this patch will get reverted then.
|
|
|
|
But for the moment, this patch is necessary to fix current misbehaviour.
|
|
|
|
Fixes: c90bb7b9b9 ("ARM: tegra: Add high speed UARTs to Jetson TK1 device tree")
|
|
Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
|
|
Acked-by: Thierry Reding <thierry.reding@gmail.com>
|
|
Cc: stable@vger.kernel.org # v4.7
|
|
Cc: linux-tegra@vger.kernel.org
|
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
|
---
|
|
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
|
|
index e52b824..6403e0d 100644
|
|
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
|
|
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
|
|
@@ -1382,7 +1382,7 @@
|
|
* Pin 41: BR_UART1_TXD
|
|
* Pin 44: BR_UART1_RXD
|
|
*/
|
|
- serial@70006000 {
|
|
+ serial@0,70006000 {
|
|
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
|
|
status = "okay";
|
|
};
|
|
@@ -1394,7 +1394,7 @@
|
|
* Pin 71: UART2_CTS_L
|
|
* Pin 74: UART2_RTS_L
|
|
*/
|
|
- serial@70006040 {
|
|
+ serial@0,70006040 {
|
|
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
|
|
status = "okay";
|
|
};
|
|
--
|
|
2.9.2
|
|
|