]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Partially revert "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible...
authorEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Mon, 9 Dec 2013 21:36:26 +0000 (18:36 -0300)
committerBrian Norris <computersforpeace@gmail.com>
Thu, 12 Dec 2013 23:01:30 +0000 (15:01 -0800)
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@vger.kernel.org> # 3.12
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>
drivers/mtd/nand/pxa3xx_nand.c

index 4cabdc9fda9076ceff440af42e028fb1073f9ed7..f3d4feafd02bd3ed00477c714d2e212009a69bbe 100644 (file)
@@ -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);