| Message ID | 20170718132220.25018-4-ludovic.desroches@microchip.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On 18/07/2017 at 15:22, Ludovic Desroches wrote: > A new compatible string has been introduced for sama5d2 SMC to allow to > manage the registers mapping change. > > Signed-off-by: Ludovic Desroches <ludovic.desroches@microchip.com> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> > --- > arch/arm/boot/dts/sama5d2.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi > index cc06da394366..3e6e2dbc2595 100644 > --- a/arch/arm/boot/dts/sama5d2.dtsi > +++ b/arch/arm/boot/dts/sama5d2.dtsi > @@ -1048,7 +1048,7 @@ > }; > > hsmc: hsmc@f8014000 { > - compatible = "atmel,sama5d3-smc", "syscon", "simple-mfd"; > + compatible = "atmel,sama5d2-smc", "syscon", "simple-mfd"; > reg = <0xf8014000 0x1000>; > interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>; > clocks = <&hsmc_clk>; >
On Tue, 18 Jul 2017, Ludovic Desroches wrote: > A new compatible string has been introduced for sama5d2 SMC to allow to > manage the registers mapping change. > > Signed-off-by: Ludovic Desroches <ludovic.desroches@microchip.com> > --- > arch/arm/boot/dts/sama5d2.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied, thanks. > diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi > index cc06da394366..3e6e2dbc2595 100644 > --- a/arch/arm/boot/dts/sama5d2.dtsi > +++ b/arch/arm/boot/dts/sama5d2.dtsi > @@ -1048,7 +1048,7 @@ > }; > > hsmc: hsmc@f8014000 { > - compatible = "atmel,sama5d3-smc", "syscon", "simple-mfd"; > + compatible = "atmel,sama5d2-smc", "syscon", "simple-mfd"; > reg = <0xf8014000 0x1000>; > interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>; > clocks = <&hsmc_clk>;
Hi Lee, On 07/08/2017 at 16:41:00 +0100, Lee Jones wrote: > On Tue, 18 Jul 2017, Ludovic Desroches wrote: > > > A new compatible string has been introduced for sama5d2 SMC to allow to > > manage the registers mapping change. > > > > Signed-off-by: Ludovic Desroches <ludovic.desroches@microchip.com> > > --- > > arch/arm/boot/dts/sama5d2.dtsi | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > Applied, thanks. > I've already applied that one and sent it to arm-soc as a fix for 4.13 (I think we agreed on that). > > diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi > > index cc06da394366..3e6e2dbc2595 100644 > > --- a/arch/arm/boot/dts/sama5d2.dtsi > > +++ b/arch/arm/boot/dts/sama5d2.dtsi > > @@ -1048,7 +1048,7 @@ > > }; > > > > hsmc: hsmc@f8014000 { > > - compatible = "atmel,sama5d3-smc", "syscon", "simple-mfd"; > > + compatible = "atmel,sama5d2-smc", "syscon", "simple-mfd"; > > reg = <0xf8014000 0x1000>; > > interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>; > > clocks = <&hsmc_clk>; > > -- > Lee Jones > Linaro STMicroelectronics Landing Team Lead > Linaro.org │ Open source software for ARM SoCs > Follow Linaro: Facebook | Twitter | Blog
On Mon, 07 Aug 2017, Alexandre Belloni wrote: > Hi Lee, > > On 07/08/2017 at 16:41:00 +0100, Lee Jones wrote: > > On Tue, 18 Jul 2017, Ludovic Desroches wrote: > > > > > A new compatible string has been introduced for sama5d2 SMC to allow to > > > manage the registers mapping change. > > > > > > Signed-off-by: Ludovic Desroches <ludovic.desroches@microchip.com> > > > --- > > > arch/arm/boot/dts/sama5d2.dtsi | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Applied, thanks. > > > > I've already applied that one and sent it to arm-soc as a fix for 4.13 > (I think we agreed on that). Okay, I just looked through my mail and remember the conversation. So the question remains; why was the patch re-sent as part of this set *after* it had already been applied? Patch unapplied, thanks. > > > diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi > > > index cc06da394366..3e6e2dbc2595 100644 > > > --- a/arch/arm/boot/dts/sama5d2.dtsi > > > +++ b/arch/arm/boot/dts/sama5d2.dtsi > > > @@ -1048,7 +1048,7 @@ > > > }; > > > > > > hsmc: hsmc@f8014000 { > > > - compatible = "atmel,sama5d3-smc", "syscon", "simple-mfd"; > > > + compatible = "atmel,sama5d2-smc", "syscon", "simple-mfd"; > > > reg = <0xf8014000 0x1000>; > > > interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>; > > > clocks = <&hsmc_clk>; > > >
diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi index cc06da394366..3e6e2dbc2595 100644 --- a/arch/arm/boot/dts/sama5d2.dtsi +++ b/arch/arm/boot/dts/sama5d2.dtsi @@ -1048,7 +1048,7 @@ }; hsmc: hsmc@f8014000 { - compatible = "atmel,sama5d3-smc", "syscon", "simple-mfd"; + compatible = "atmel,sama5d2-smc", "syscon", "simple-mfd"; reg = <0xf8014000 0x1000>; interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>; clocks = <&hsmc_clk>;
A new compatible string has been introduced for sama5d2 SMC to allow to manage the registers mapping change. Signed-off-by: Ludovic Desroches <ludovic.desroches@microchip.com> --- arch/arm/boot/dts/sama5d2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)