[PATCH] mtd: nand: pxa3xx: Disable "armada370-nand" compatible support

Ezequiel Garcia ezequiel.garcia at free-electrons.com
Sat Dec 7 10:39:47 EST 2013


Currently the "armada370-nand" compatible support is not complete,
and it was mistake to add it. Instead of completely removing the compatible,
let's just disable it until all the needed infrastructure is in place.

Cc: Emilio López <emilio at elopez.com.ar>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
---
The compatible was added in:

commit c0f3b8643a6fa2461d70760ec49d21d2b031d611
Author: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
Date:   Sat Aug 10 16:34:52 2013 -0300

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

Which means the fix should be applied in v3.12 and v3.13.

On Emilio's suggestion, I've opted for the disabling, given all the required
support is already queued for v3.14. I'll push a patch removing the #if 0
on top of current l2-mtd.git.

Brian: Do you think this is OK to be pushed now for v3.13?

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

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 3d143fe..2c5066f 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -333,10 +333,16 @@ static struct of_device_id pxa3xx_nand_dt_ids[] = {
 		.compatible = "marvell,pxa3xx-nand",
 		.data       = (void *)PXA3XX_NAND_VARIANT_PXA,
 	},
+/*
+ * Currently, the armada370 support is incomplete and can cause the
+ * system to crash. Disable it until all the infrastructure is in place.
+ */
+#if 0
 	{
 		.compatible = "marvell,armada370-nand",
 		.data       = (void *)PXA3XX_NAND_VARIANT_ARMADA370,
 	},
+#endif
 	{}
 };
 MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids);
-- 
1.8.1.5




More information about the linux-arm-kernel mailing list