On Mon, Jul 18, 2016 at 11:46:48AM +0200, Ralf Ramsauer wrote:
> 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@xxxxxxxxxxxxxxxxxxxxxx>
> Acked-by: Thierry Reding <thierry.reding@xxxxxxxxx>
> Cc: linux-tegra@xxxxxxxxxxxxxxx
> ---
> arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
ARM-SoC maintainers,
Just to clarify, this is targetted at v4.7 because the offending patch
was merged in v4.7-rc1. If at all possible it'd be great to get this in,
even if this is terribly last minute.
Thanks,
Thierry
>
> diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
> index 941f362..f4d8125 100644
> --- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
> +++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
> @@ -1386,7 +1386,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";
> };
> @@ -1398,7 +1398,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.7.3
>
Attachment:
signature.asc
Description: PGP signature
