Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c59ac61 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Brian Norris
Browse files

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



This partially reverts c0f3b864.

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: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 6ce4eac1

drivers/mtd/nand/pxa3xx_nand.c

+0 −4
Original line number Diff line number Diff line
@@ -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);