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@xxxxxxxxx> > > Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx> > > 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; >> > > -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html