1 files changed, 0 insertions, 88 deletions
diff --git a/target/linux/mvebu/patches-3.10/0114-mtd-nand-pxa3xx-Introduce-marvell-armada370-nand-com.patch b/target/linux/mvebu/patches-3.10/0114-mtd-nand-pxa3xx-Introduce-marvell-armada370-nand-com.patch
deleted file mode 100644
index b18e61fbca..0000000000
--- a/target/linux/mvebu/patches-3.10/0114-mtd-nand-pxa3xx-Introduce-marvell-armada370-nand-com.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 259e46e4327a9937761fd3f7bc07e208b1fa50e6 Mon Sep 17 00:00:00 2001
-From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
-Date: Sat, 10 Aug 2013 16:34:52 -0300
-Subject: [PATCH 114/203] mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand'
- compatible string
-
-This driver supports NFCv1 (as found in PXA SoC) and NFCv2 (as found in
-Armada 370/XP SoC). As both controller has a few differences, a way of
-distinguishing between the two is needed.
-
-This commit introduces a new compatible string 'marvell,armada370-nand'
-and assigns a compatible data of type enum pxa3xx_nand_variant to allow
-such distinction.
-
-Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
-Tested-by: Daniel Mack <zonque@gmail.com>
-Cc: devicetree@vger.kernel.org
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
----
- drivers/mtd/nand/pxa3xx_nand.c | 31 ++++++++++++++++++++++++++++++-
- 1 file changed, 30 insertions(+), 1 deletion(-)
-
---- a/drivers/mtd/nand/pxa3xx_nand.c
-+++ b/drivers/mtd/nand/pxa3xx_nand.c
-@@ -123,6 +123,11 @@ enum {
- 	STATE_READY,
- };
- 
-+enum pxa3xx_nand_variant {
-+	PXA3XX_NAND_VARIANT_PXA,
-+	PXA3XX_NAND_VARIANT_ARMADA370,
-+};
-+
- struct pxa3xx_nand_host {
- 	struct nand_chip	chip;
- 	struct pxa3xx_nand_cmdset *cmdset;
-@@ -171,6 +176,12 @@ struct pxa3xx_nand_info {
- 	struct pxa3xx_nand_host *host[NUM_CHIP_SELECT];
- 	unsigned int		state;
- 
-+	/*
-+	 * This driver supports NFCv1 (as found in PXA SoC)
-+	 * and NFCv2 (as found in Armada 370/XP SoC).
-+	 */
-+	enum pxa3xx_nand_variant variant;
-+
- 	int			cs;
- 	int			use_ecc;	/* use HW ECC ? */
- 	int			use_dma;	/* use DMA ? */
-@@ -1192,11 +1203,28 @@ static int pxa3xx_nand_remove(struct pla
- 
- #ifdef CONFIG_OF
- static struct of_device_id pxa3xx_nand_dt_ids[] = {
--	{ .compatible = "marvell,pxa3xx-nand" },
-+	{
-+		.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);
- 
-+static enum pxa3xx_nand_variant
-+pxa3xx_nand_get_variant(struct platform_device *pdev)
-+{
-+	const struct of_device_id *of_id =
-+			of_match_device(pxa3xx_nand_dt_ids, &pdev->dev);
-+	if (!of_id)
-+		return PXA3XX_NAND_VARIANT_PXA;
-+	return (enum pxa3xx_nand_variant)of_id->data;
-+}
-+
- static int pxa3xx_nand_probe_dt(struct platform_device *pdev)
- {
- 	struct pxa3xx_nand_platform_data *pdata;
-@@ -1252,6 +1280,7 @@ static int pxa3xx_nand_probe(struct plat
- 	}
- 
- 	info = platform_get_drvdata(pdev);
-+	info->variant = pxa3xx_nand_get_variant(pdev);
- 	probe_success = 0;
- 	for (cs = 0; cs < pdata->num_cs; cs++) {
- 		info->cs = cs;