On 08/10/2016 10:46 PM, Arnd Bergmann wrote: > On Monday, July 18, 2016 11:58:02 AM CEST Thierry Reding wrote: >> 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. >> > > I just notice this was still missing in v4.8-rc1, so I added it to > the fixes branch now, with a stable tag for v4.7 Hi Arnd, Ahm - this patch should have only be applied if it would have been possible to commit it before the release of v4.7. Mainline Patch b5896f6 ("ARM: tegra: Remove commas from unit addresses on Tegra124") which was introduced during the merge window of v4.8 makes this patch superfluous and introduces the same error again that we initially wanted to fix :-) This patch is only required for stable v4.7.x. I think the best is to revert it on mainline, as long as stabilization window is still open. Ralf > > Arnd > -- Ralf Ramsauer PGP: 0x8F10049B -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html