From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Date: Mon, 9 Dec 2013 21:36:26 +0000 (-0300)
Subject: Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible... 
X-Git-Tag: v3.12.6~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20a3008e850fc5b06595f3d850aea38c16213900;p=thirdparty%2Fkernel%2Fstable.git

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

commit 9c59ac616137fb62f6cb3f1219201b09cbcf30be upstream.

This partially reverts c0f3b8643a6fa2461d70760ec49d21d2b031d611.

The "armada370-nand" compatible support is not complete, and it was mistake
to add it. Revert it and postpone the support until the infrastructure is
in place.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index c28d4e29af1a5..e76a733e8a28b 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1241,10 +1241,6 @@ 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);