| Message ID | 1421923305-10088-1-git-send-email-josh.wu@atmel.com |
|---|---|
| State | Not Applicable |
| Headers | show |
Le 22/01/2015 11:41, Josh Wu a écrit : > As we introduce a new "atmel,sama5d4-nand" compatible string for sama5d4, > so we need to apply it for sama5d4 chip. > > Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Brian, I suppose that it makes sense to keep this patch with the previous one. So, can you take it in your tree? Otherwise, it can take the at91 -> arm-soc route. Bye, > --- > > Changes in v2: > - still keep the old rm9200 nand compatible string for compatible old driver. > > arch/arm/boot/dts/sama5d4.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi > index 1b0f30c..e40b1da 100644 > --- a/arch/arm/boot/dts/sama5d4.dtsi > +++ b/arch/arm/boot/dts/sama5d4.dtsi > @@ -267,7 +267,7 @@ > }; > > nand0: nand@80000000 { > - compatible = "atmel,at91rm9200-nand"; > + compatible = "atmel,sama5d4-nand", "atmel,at91rm9200-nand"; > #address-cells = <1>; > #size-cells = <1>; > ranges; >
Le 22/01/2015 12:01, Nicolas Ferre a écrit : > Le 22/01/2015 11:41, Josh Wu a écrit : >> As we introduce a new "atmel,sama5d4-nand" compatible string for sama5d4, >> so we need to apply it for sama5d4 chip. >> >> Signed-off-by: Josh Wu <josh.wu@atmel.com> > > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > Brian, > I suppose that it makes sense to keep this patch with the previous one. > So, can you take it in your tree? > > Otherwise, it can take the at91 -> arm-soc route. Bryan, I take it with me right now and try to send it to arm-soc for 3.20. Best regards, >> --- >> >> Changes in v2: >> - still keep the old rm9200 nand compatible string for compatible old driver. >> >> arch/arm/boot/dts/sama5d4.dtsi | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi >> index 1b0f30c..e40b1da 100644 >> --- a/arch/arm/boot/dts/sama5d4.dtsi >> +++ b/arch/arm/boot/dts/sama5d4.dtsi >> @@ -267,7 +267,7 @@ >> }; >> >> nand0: nand@80000000 { >> - compatible = "atmel,at91rm9200-nand"; >> + compatible = "atmel,sama5d4-nand", "atmel,at91rm9200-nand"; >> #address-cells = <1>; >> #size-cells = <1>; >> ranges; >> > >
On Mon, Jan 26, 2015 at 04:07:36PM +0100, Nicolas Ferre wrote: > Le 22/01/2015 12:01, Nicolas Ferre a écrit : > > Le 22/01/2015 11:41, Josh Wu a écrit : > >> As we introduce a new "atmel,sama5d4-nand" compatible string for sama5d4, > >> so we need to apply it for sama5d4 chip. > >> > >> Signed-off-by: Josh Wu <josh.wu@atmel.com> > > > > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > > > Brian, > > I suppose that it makes sense to keep this patch with the previous one. > > So, can you take it in your tree? > > > > Otherwise, it can take the at91 -> arm-soc route. I actually would prefer that. The changes are sane enough by themselves, and I don't often touch the arch/arm DTS files. > I take it with me right now and try to send it to arm-soc for 3.20. That's fine. Thanks. Brian
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi index 1b0f30c..e40b1da 100644 --- a/arch/arm/boot/dts/sama5d4.dtsi +++ b/arch/arm/boot/dts/sama5d4.dtsi @@ -267,7 +267,7 @@ }; nand0: nand@80000000 { - compatible = "atmel,at91rm9200-nand"; + compatible = "atmel,sama5d4-nand", "atmel,at91rm9200-nand"; #address-cells = <1>; #size-cells = <1>; ranges;
As we introduce a new "atmel,sama5d4-nand" compatible string for sama5d4, so we need to apply it for sama5d4 chip. Signed-off-by: Josh Wu <josh.wu@atmel.com> --- Changes in v2: - still keep the old rm9200 nand compatible string for compatible old driver. arch/arm/boot/dts/sama5d4.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)