[PATCH] mtd: nand: pxa3xx: Add "armada370-nand" compatible

Ezequiel Garcia ezequiel.garcia at free-electrons.com
Tue Dec 24 10:40:07 EST 2013


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 at 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 at 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




More information about the linux-mtd mailing list