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

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=9c59ac616137fb62f6cb3f1219201b09cbcf30be
Commit:     9c59ac616137fb62f6cb3f1219201b09cbcf30be
Parent:     6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae
Author:     Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
AuthorDate: Mon Dec 9 18:36:26 2013 -0300
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Thu Dec 12 15:01:30 2013 -0800

    Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"
    
    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.
    
    Cc: <stable at vger.kernel.org> # 3.12
    Signed-off-by: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
    Acked-by: Jason Cooper <jason at lakedaemon.net>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/nand/pxa3xx_nand.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 4cabdc9..f3d4fea 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1259,10 +1259,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);