linux-mtd.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mtd: nand: pxa3xx: Add "armada370-nand" compatible
@ 2013-12-24 15:40 Ezequiel Garcia
  2013-12-24 19:47 ` Jason Cooper
  0 siblings, 1 reply; 5+ messages in thread
From: Ezequiel Garcia @ 2013-12-24 15:40 UTC (permalink / raw)
  To: linux-mtd
  Cc: Thomas Petazzoni, Lior Amsalem, Jason Cooper, Ezequiel Garcia,
	Gregory Clement, Brian Norris

Now that the driver can support the Armada 370/XP SoC NAND controller,
add the devicetree compatible string, enabling its use.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
Applies on top of l2-mtd.git master branch, rebased on top of v3.13-rc4
in order to include:

commit 9c59ac616137fb62f6cb3f1219201b09cbcf30be
Author: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Date:   Mon Dec 9 18:36:26 2013 -0300

    Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"

and it is v3.14 material.

 drivers/mtd/nand/pxa3xx_nand.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 0599a88..31aae53 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -333,6 +333,10 @@ static struct of_device_id pxa3xx_nand_dt_ids[] = {
 		.compatible = "marvell,pxa3xx-nand",
 		.data       = (void *)PXA3XX_NAND_VARIANT_PXA,
 	},
+	{
+		.compatible = "marvell,armada370-nand",
+		.data       = (void *)PXA3XX_NAND_VARIANT_ARMADA370,
+	},
 	{}
 };
 MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids);
-- 
1.8.1.5

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2014-01-13  7:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-24 15:40 [PATCH] mtd: nand: pxa3xx: Add "armada370-nand" compatible Ezequiel Garcia
2013-12-24 19:47 ` Jason Cooper
2014-01-12 14:19   ` Ezequiel Garcia
2014-01-12 14:21     ` Ezequiel Garcia
2014-01-13  7:52       ` Brian Norris

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).