Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1445341 > unrolled thread

[RESEND PATCH] ARM: tegra: fix erroneous address in dts

Back to article view | Back to linux.kernel

Contents

  [RESEND PATCH] ARM: tegra: fix erroneous address in dts Ralf Ramsauer <ralf@ramses-pyramidenbau.de> - 2016-07-18 11:50 +0200
    Re: [RESEND PATCH] ARM: tegra: fix erroneous address in dts Thierry Reding <thierry.reding@gmail.com> - 2016-07-18 12:00 +0200
      Re: [RESEND PATCH] ARM: tegra: fix erroneous address in dts Arnd Bergmann <arnd@arndb.de> - 2016-07-21 14:30 +0200
        Re: [RESEND PATCH] ARM: tegra: fix erroneous address in dts Ralf Ramsauer <ralf@ramses-pyramidenbau.de> - 2016-07-21 14:40 +0200
        Re: [RESEND PATCH] ARM: tegra: fix erroneous address in dts Ralf Ramsauer <ralf@ramses-pyramidenbau.de> - 2016-07-24 22:40 +0200
          Re: [RESEND PATCH] ARM: tegra: fix erroneous address in dts Thierry Reding <thierry.reding@gmail.com> - 2016-07-25 16:20 +0200

#1445341 — [RESEND PATCH] 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: linux-tegra@vger.kernel.org
---
 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 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

[toc] | [next] | [standalone]

#1445346

[Multipart message — attachments visible in raw view] — view raw

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
> 

[toc] | [prev] | [next] | [standalone]

#1447825

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

[toc] | [prev] | [next] | [standalone]

#1447829

[Multipart message — attachments visible in raw view] — view raw

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
> 

-- 
Ralf Ramsauer
PGP: 0x8F10049B

[toc] | [prev] | [next] | [standalone]

#1449204

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
> 


-- 
Ralf Ramsauer
GPG: 0x8F10049B

[toc] | [prev] | [next] | [standalone]

#1449534

[Multipart message — attachments visible in raw view] — view raw

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web