On Wed, 25 May 2016 20:16:54 -0700 Brian Norris <computersforpeace@xxxxxxxxx> wrote: > Hi, > > On Mon, May 09, 2016 at 02:51:18PM +0800, Wenyou Yang wrote: > > This reverts commit 5ddc7bd43ccc ("mtd: atmel_nand: Support variable > > RB_EDGE interrupts") > > > > Because for current SoCs, the RB_EDGE3(i.e. bit 27) of HSMC_SR > > register does not exist, the RB_EDGE0 (i.e. bit 24) is the ready/busy > > line edge status bit. It is a datasheet bug. > > > > Signed-off-by: Wenyou Yang <wenyou.yang@xxxxxxxxx> > > --- > > > > .../devicetree/bindings/mtd/atmel-nand.txt | 2 +- > > drivers/mtd/nand/atmel_nand.c | 35 +++++----------------- > > drivers/mtd/nand/atmel_nand_nfc.h | 3 +- > > 3 files changed, 10 insertions(+), 30 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/mtd/atmel-nand.txt b/Documentation/devicetree/bindings/mtd/atmel-nand.txt > > index d53aba9..3e7ee99 100644 > > --- a/Documentation/devicetree/bindings/mtd/atmel-nand.txt > > +++ b/Documentation/devicetree/bindings/mtd/atmel-nand.txt > > @@ -39,7 +39,7 @@ Optional properties: > > > > Nand Flash Controller(NFC) is an optional sub-node > > Required properties: > > -- compatible : "atmel,sama5d3-nfc" or "atmel,sama5d4-nfc". > > +- compatible : "atmel,sama5d3-nfc". > > - reg : should specify the address and size used for NFC command registers, > > NFC registers and NFC SRAM. NFC SRAM address and size can be absent > > if don't want to use it. > > diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c > > index efc8ea2..68b9160 100644 > > --- a/drivers/mtd/nand/atmel_nand.c > > +++ b/drivers/mtd/nand/atmel_nand.c > [...] > > static const struct of_device_id atmel_nand_nfc_match[] = { > > - { .compatible = "atmel,sama5d3-nfc", .data = &sama5d3_nfc_caps }, > > - { .compatible = "atmel,sama5d4-nfc", .data = &sama5d4_nfc_caps }, > > + { .compatible = "atmel,sama5d3-nfc" }, > > Hmm, wait. Didn't Rob and Alexandre suggest that we should *not* drop > the compatible property? We could have easily supported both here, and > just not listed any different capabilities. But I see that Nicholas took > the patch anyway, so I guess it's not a big deal... Yes, actually the compatible change was introduced and fixed in the same release, so I don't think the stable ABI argument stands here. -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -- 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