| Message ID | 1468835208-13426-1-git-send-email-ralf@ramses-pyramidenbau.de |
|---|---|
| State | Deferred |
| Headers | show |
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@ramses-pyramidenbau.de> > Acked-by: Thierry Reding <thierry.reding@gmail.com> > Cc: linux-tegra@vger.kernel.org > --- > 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 >
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@ramses-pyramidenbau.de> > > Acked-by: Thierry Reding <thierry.reding@gmail.com> > > Cc: linux-tegra@vger.kernel.org > > --- > > 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've applied it to the fixes branch, but as Linus is currently offline and hasn't pulled the previous set of fixes, I suspect it's not going to make it. Olof, do you think we should send an amended pull request, or are we at the point where nothing gets pulled anyway? Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/21/2016 02:28 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@ramses-pyramidenbau.de> >>> Acked-by: Thierry Reding <thierry.reding@gmail.com> >>> Cc: linux-tegra@vger.kernel.org >>> --- >>> 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. >> > Arnd, > I've applied it to the fixes branch, but as Linus is currently offline > and hasn't pulled the previous set of fixes, I suspect it's not > going to make it. thank you very much. If it's not merged in 4.7 then I'll follow up with a revert patch with stable in Cc. Ralf > > Olof, do you think we should send an amended pull request, or are > we at the point where nothing gets pulled anyway? > > Arnd >
On 07/21/2016 02:28 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@ramses-pyramidenbau.de> >>> Acked-by: Thierry Reding <thierry.reding@gmail.com> >>> Cc: linux-tegra@vger.kernel.org >>> --- >>> 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've applied it to the fixes branch, but as Linus is currently offline > and hasn't pulled the previous set of fixes, I suspect it's not > going to make it. Yep, didn't make it. I'll resend the fix with stable in Cc tomorrow. Keep you also in Cc. Thierry, this fix is only required for 4.7.x and gets superfluous when b5896f67ab3c is applied. So I guess there is no need to fix mainline, right? Ralf > > Olof, do you think we should send an amended pull request, or are > we at the point where nothing gets pulled anyway? > > Arnd >
On Sun, Jul 24, 2016 at 10:38:38PM +0200, Ralf Ramsauer wrote: > On 07/21/2016 02:28 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@ramses-pyramidenbau.de> > >>> Acked-by: Thierry Reding <thierry.reding@gmail.com> > >>> Cc: linux-tegra@vger.kernel.org > >>> --- > >>> 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've applied it to the fixes branch, but as Linus is currently offline > > and hasn't pulled the previous set of fixes, I suspect it's not > > going to make it. > Yep, didn't make it. I'll resend the fix with stable in Cc tomorrow. > Keep you also in Cc. > > Thierry, this fix is only required for 4.7.x and gets superfluous when > b5896f67ab3c is applied. So I guess there is no need to fix mainline, right? Agreed. Thierry
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@ramses-pyramidenbau.de> > > Acked-by: Thierry Reding <thierry.reding@gmail.com> > > Cc: linux-tegra@vger.kernel.org > > --- > > 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 Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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@ramses-pyramidenbau.de> >>> Acked-by: Thierry Reding <thierry.reding@gmail.com> >>> Cc: linux-tegra@vger.kernel.org >>> --- >>> 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 >
Hi, may I poke you again? Could you please revert this one (b5c86b7 upstream)? It was only required for 4.7.x where it got already applied. Thanks Ralf On 08/12/2016 07:26 PM, Ralf Ramsauer wrote: > 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@ramses-pyramidenbau.de> >>>> Acked-by: Thierry Reding <thierry.reding@gmail.com> >>>> Cc: linux-tegra@vger.kernel.org >>>> --- >>>> 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 >> > -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi all, may I *poke* you again? We're close to the release of 4.8, and this patch (b5c86b749 upstream) should still be reverted on mainline.... Ralf 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@ramses-pyramidenbau.de> >>> Acked-by: Thierry Reding <thierry.reding@gmail.com> >>> Cc: linux-tegra@vger.kernel.org >>> --- >>> 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 > > Arnd >
On Wed, Sep 07, 2016 at 03:50:57PM +0200, Ralf Ramsauer wrote: > Hi all, > > may I *poke* you again? > > We're close to the release of 4.8, and this patch (b5c86b749 upstream) > should still be reverted on mainline.... Ok, done in fixes now. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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"; };
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: linux-tegra@vger.kernel.org --- arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)