diff options
| author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2013-12-09 21:36:26 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 15:48:57 (GMT) |
| commit | 20a3008e850fc5b06595f3d850aea38c16213900 (patch) | |
| tree | 26c7308ef730a8c54372fa774963f6fe6747bd45 /drivers/mtd | |
| parent | 1f02a127dd7b35ebe3df64320347c6ee904a8338 (diff) | |
| download | linux-fsl-qoriq-20a3008e850fc5b06595f3d850aea38c16213900.tar.xz | |
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>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index c28d4e2..e76a733 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); |