FAILED: patch "[PATCH] mtd: atmel_nand: Support variable RB_EDGE interrupts" failed to apply to 4.6-stable tree

From 5ddc7bd43ccc77173f149483fa27a0b8f85e09e5 Mon Sep 17 00:00:00 2001

-----Original Message-----
From: [email protected] [mailto:[email protected]]
Sent: 2016年6月5日 5:58
To: [email protected]; Yang, Wenyou <[email protected]>; [email protected]; [email protected]; [email protected]; Yang, Wenyou <[email protected]>
Cc: [email protected]
Subject: FAILED: patch "[PATCH] mtd: atmel_nand: Support variable RB_EDGE interrupts" failed to apply to 4.6-stable tree

The patch below does not apply to the 4.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 5ddc7bd43ccc77173f149483fa27a0b8f85e09e5 Mon Sep 17 00:00:00 2001
From: Romain Izard <[email protected]>
Date: Wed, 10 Feb 2016 10:56:23 +0100
Subject: [PATCH] mtd: atmel_nand: Support variable RB_EDGE interrupts

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 <[email protected]>

Reviewed-by Wenyou Yang <[email protected]>

Tested-by Wenyou Yang <[email protected]>

Reviewed-by Boris Brezillon <[email protected]>

Signed-off-by Romain Izard <[email protected]>

Signed-off-by Brian Norris <[email protected]>

Documentation/devicetree/bindings/mtd/atmel-nand.txt +1 -1

index 7d4c8eb775a5..89b0db9801b0 100644
@@ -34,7 +34,7 @@ Optional properties:
 - nand-on-flash-bbt: boolean to enable on flash bbt option if not present false
 - Nand Flash Controller(NFC) is a slave driver under Atmel nand flash
   - Required properties:
-    - compatible : "atmel,sama5d3-nfc".
+    - compatible : "atmel,sama5d3-nfc" or "atmel,sama5d4-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.

drivers/mtd/nand/atmel_nand.c index renamed from drivers/mtd/nand/atmel_nand.c +0 -0

affe7a7e9ad7..06a3e11f6684 100644

drivers/mtd/nand/atmel_nand.c +4 -0

@@ -67,6 +67,10 @@ struct atmel_nand_caps {
 	bool pmecc_correct_erase_page;
 };
 
+struct atmel_nand_nfc_caps {
+	uint32_t rb_mask;
+};
+
 /* oob layout for large page size
  * bad block info is on bytes 0 and 1
  * the bytes have to be consecutives to avoid @@ -111,6 +115,7 @@ struct

atmel_nfc {

drivers/mtd/nand/atmel_nand.c +3 -2

 	/* Point to the sram bank which include readed data via NFC */
 	void			*data_in_sram;
 	bool			will_write_sram;
+	const struct atmel_nand_nfc_caps *caps;
 };
 static struct atmel_nfc	nand_nfc;

@@ -1675,9 +1680,9 @@ static irqreturn_t hsmc_interrupt(int irq, void *dev_id)
 		nfc_writel(host->nfc->hsmc_regs, IDR, NFC_SR_XFR_DONE);
 		ret = IRQ_HANDLED;
 	}
-	if (pending & NFC_SR_RB_EDGE) {
+	if (pending & host->nfc->caps->rb_mask) {
 		complete(&host->nfc->comp_ready);
-		nfc_writel(host->nfc->hsmc_regs, IDR, NFC_SR_RB_EDGE);
+		nfc_writel(host->nfc->hsmc_regs, IDR, host->nfc->caps-
 >rb_mask);
 		ret = IRQ_HANDLED;
 	}

drivers/mtd/nand/atmel_nand.c +1 -1

 	if (pending & NFC_SR_CMD_DONE) {

@@ -1695,7 +1700,7 @@ static void nfc_prepare_interrupt(struct
 atmel_nand_host *host, u32 flag)
 	if (flag & NFC_SR_XFR_DONE)
 		init_completion(&host->nfc->comp_xfer_done);
 
-	if (flag & NFC_SR_RB_EDGE)
+	if (flag & host->nfc->caps->rb_mask)
 		init_completion(&host->nfc->comp_ready);
 

drivers/mtd/nand/atmel_nand.c +1 -1

 	if (flag & NFC_SR_CMD_DONE)

@@ -1713,7 +1718,7 @@ static int nfc_wait_interrupt(struct atmel_nand_host
 *host, u32 flag)
 	if (flag & NFC_SR_XFR_DONE)
 		comp[index++] = &host->nfc->comp_xfer_done;
 
-	if (flag & NFC_SR_RB_EDGE)
+	if (flag & host->nfc->caps->rb_mask)
 		comp[index++] = &host->nfc->comp_ready;
 

drivers/mtd/nand/atmel_nand.c +1 -1

 	if (flag & NFC_SR_CMD_DONE)

@@ -1781,7 +1786,7 @@ static int nfc_device_ready(struct mtd_info *mtd)
 		dev_err(host->dev, "Lost the interrupt flags: 0x%08x\n",
 				mask & status);
 
-	return status & NFC_SR_RB_EDGE;
+	return status & host->nfc->caps->rb_mask;
 }
 
 static void nfc_select_chip(struct mtd_info *mtd, int chip) @@ -1954,8 +1959,8

@@ static void nfc_nand_command(struct mtd_info *mtd, unsigned int command,

drivers/mtd/nand/atmel_nand.c +17 -3

 		}
 		/* fall through */
 	default:
-		nfc_prepare_interrupt(host, NFC_SR_RB_EDGE);
-		nfc_wait_interrupt(host, NFC_SR_RB_EDGE);
+		nfc_prepare_interrupt(host, host->nfc->caps->rb_mask);
+		nfc_wait_interrupt(host, host->nfc->caps->rb_mask);
 	}
 }

@@ -2352,6 +2357,11 @@ 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 (!nfc->caps)
+		return -ENODEV;
+
 	nfc_writel(nfc->hsmc_regs, IDR, 0xffffffff);
 	nfc_readl(nfc->hsmc_regs, SR);	/* clear the NFC_SR */

@@ -2380,8 +2390,17 @@ static int atmel_nand_nfc_remove(struct
 platform_device *pdev)
 	return 0;
 }
 
+static const struct atmel_nand_nfc_caps sama5d3_nfc_caps = {
+	.rb_mask = NFC_SR_RB_EDGE0,
+};
+
+static const struct atmel_nand_nfc_caps sama5d4_nfc_caps = {
+	.rb_mask = NFC_SR_RB_EDGE3,
+};
+
 static const struct of_device_id atmel_nand_nfc_match[] = {
-	{ .compatible = "atmel,sama5d3-nfc" },
+	{ .compatible = "atmel,sama5d3-nfc", .data = &sama5d3_nfc_caps },
+	{ .compatible = "atmel,sama5d4-nfc", .data = &sama5d4_nfc_caps },
 	{ /* sentinel */ }
 };

MODULE_DEVICE_TABLE(of, atmel_nand_nfc_match); diff --git
a/drivers/mtd/nand/atmel_nand_nfc.h b/drivers/mtd/nand/atmel_nand_nfc.h index 4d5d26221a7e..0bbc1fa97dba 100644

Quoted 11 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]]
Sent: 2016年6月5日 5:58
To: [email protected]; Yang, Wenyou <[email protected]>; [email protected]; [email protected]; [email protected]; Yang, Wenyou <[email protected]>
Cc: [email protected]
Subject: FAILED: patch "[PATCH] mtd: atmel_nand: Support variable RB_EDGE interrupts" failed to apply to 4.6-stable tree

Quoted 4 lines

The patch below does not apply to the 4.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

This patch is unneeded.
It has been reverted by the commit 53b74ed2d0b4 ("Revert "mtd: atmel_nand: Support variable RB_EDGE interrupts"").

Please don't apply this one.

Quoted 11 lines

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 5ddc7bd43ccc77173f149483fa27a0b8f85e09e5 Mon Sep 17 00:00:00 2001
From: Romain Izard <[email protected]>
Date: Wed, 10 Feb 2016 10:56:23 +0100
Subject: [PATCH] mtd: atmel_nand: Support variable RB_EDGE interrupts

Quoted 28 lines · Wenyou

Quoted 11 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]]
Sent: 2016年6月5日 5:58
To: [email protected]; Yang, Wenyou <[email protected]>; [email protected]; [email protected]; [email protected]; Yang, Wenyou <[email protected]>
Cc: [email protected]
Subject: FAILED: patch "[PATCH] mtd: atmel_nand: Support variable RB_EDGE interrupts" failed to apply to 4.6-stable tree

Quoted 4 lines

The patch below does not apply to the 4.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

This patch is unneeded.
It has been reverted by the commit 53b74ed2d0b4 ("Revert "mtd: atmel_nand: Support variable RB_EDGE interrupts"").

Please don't apply this one.

Quoted 7 lines

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 4 lines

Quoted 4 lines

From 5ddc7bd43ccc77173f149483fa27a0b8f85e09e5 Mon Sep 17 00:00:00 2001
From: Romain Izard <[email protected]>
Date: Wed, 10 Feb 2016 10:56:23 +0100
Subject: [PATCH] mtd: atmel_nand: Support variable RB_EDGE interrupts

Why is commit 5ddc7bd43ccc77173f149483fa27a0b8f85e09e5 even showing up here? If this was automated, then that seems like a bug in the -stable scripts.