]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob
4091c5508e22f01cd99fb5bef566b25edad5ecd8
[thirdparty/kernel/stable-queue.git] /
1 From 9c59ac616137fb62f6cb3f1219201b09cbcf30be Mon Sep 17 00:00:00 2001
2 From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
3 Date: Mon, 9 Dec 2013 18:36:26 -0300
4 Subject: Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string"
5
6 From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
7
8 commit 9c59ac616137fb62f6cb3f1219201b09cbcf30be upstream.
9
10 This partially reverts c0f3b8643a6fa2461d70760ec49d21d2b031d611.
11
12 The "armada370-nand" compatible support is not complete, and it was mistake
13 to add it. Revert it and postpone the support until the infrastructure is
14 in place.
15
16 Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
17 Acked-by: Jason Cooper <jason@lakedaemon.net>
18 Signed-off-by: Brian Norris <computersforpeace@gmail.com>
19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
20
21 ---
22 drivers/mtd/nand/pxa3xx_nand.c | 4 ----
23 1 file changed, 4 deletions(-)
24
25 --- a/drivers/mtd/nand/pxa3xx_nand.c
26 +++ b/drivers/mtd/nand/pxa3xx_nand.c
27 @@ -1241,10 +1241,6 @@ static struct of_device_id pxa3xx_nand_d
28 .compatible = "marvell,pxa3xx-nand",
29 .data = (void *)PXA3XX_NAND_VARIANT_PXA,
30 },
31 - {
32 - .compatible = "marvell,armada370-nand",
33 - .data = (void *)PXA3XX_NAND_VARIANT_ARMADA370,
34 - },
35 {}
36 };
37 MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids);