Commit b5c86b74 authored by Ralf Ramsauer's avatar Ralf Ramsauer Committed by Arnd Bergmann

ARM: tegra: fix erroneous address in dts

c90bb7b9 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 (b5896f67 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: c90bb7b9 ("ARM: tegra: Add high speed UARTs to Jetson TK1 device tree")
Signed-off-by: default avatarRalf Ramsauer <ralf@ramses-pyramidenbau.de>
Acked-by: default avatarThierry Reding <thierry.reding@gmail.com>
Cc: stable@vger.kernel.org # v4.7
Cc: linux-tegra@vger.kernel.org
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent f2b54191
...@@ -1382,7 +1382,7 @@ dsi_b { ...@@ -1382,7 +1382,7 @@ dsi_b {
* Pin 41: BR_UART1_TXD * Pin 41: BR_UART1_TXD
* Pin 44: BR_UART1_RXD * Pin 44: BR_UART1_RXD
*/ */
serial@70006000 { serial@0,70006000 {
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
status = "okay"; status = "okay";
}; };
...@@ -1394,7 +1394,7 @@ serial@70006000 { ...@@ -1394,7 +1394,7 @@ serial@70006000 {
* Pin 71: UART2_CTS_L * Pin 71: UART2_CTS_L
* Pin 74: UART2_RTS_L * Pin 74: UART2_RTS_L
*/ */
serial@70006040 { serial@0,70006040 {
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
status = "okay"; status = "okay";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment