diff mbox

[v4,1/5] mtd: atmel_nand: Support variable RB_EDGE interrupts

Message ID 20160212182757.GO19540@google.com
State Accepted
Headers show

Commit Message

Brian Norris Feb. 12, 2016, 6:27 p.m. UTC 
On Wed, Feb 10, 2016 at 10:56:23AM +0100, Romain Izard wrote:
> The NFC controller used to accelerate the NAND transfers on SAMA5 chips
> can use either RB_EDGE0 or RB_EDGE3 as its ready/busy interrupt bit.
> 
> Use the controller's compatible string to select the correct bit.
> 
> For the binding:
> Acked-by: Rob Herring <robh@kernel.org>
> 
> Reviewed-by: Wenyou Yang <Wenyou.yang@atmel.com>
> Tested-by: Wenyou Yang <wenyou.yang@atmel.com>
> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
> ---
> v4: collect tested-by and reviewed-by tags
> v3: constify atmel_nand_nfc_caps structures
> v2: use of_device_get_match_data
>     rename struct atmel_nand_nfc_priv as atmel_nand_nfc_caps
>     rename member rb_edge as rb_mask
>     do not create defines for unused status bits
> 
>  .../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, 30 insertions(+), 10 deletions(-)

Applied patches 1-4, with the following style diff:
diff mbox

Patch

diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index aaad1b98dd0d..20cbaabb2959 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -2395,7 +2395,7 @@  static int atmel_nand_nfc_probe(struct platform_device *pdev)
 
 	nfc->caps = (const struct atmel_nand_nfc_caps *)
 		of_device_get_match_data(&pdev->dev);
-	if (NULL == nfc->caps)
+	if (!nfc->caps)
 		return -ENODEV;
 
 	nfc_writel(nfc->hsmc_regs, IDR, 0xffffffff);