Skip to contentSkip to conversation

mtd: pxa3xx_nand: add cmdline part parser support

PATCH New Haojian Zhuang 2 participants 2 messages May 14, 2010 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

PATCH 17/20 mtd: pxa3xx_nand: add cmdline part parser support

#1 lore raw

PATCH 17/20 mtd: pxa3xx_nand: add cmdline part parser support

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 7 lines · Haojian Zhuang
Quoted 1 line

From aeab6a19eeb5ff8715ba16497124fae539641e46 Mon Sep 17 00:00:00 2001

From: Lei Wen <[email protected]>
Date: Thu, 6 May 2010 10:42:13 +0800
Subject: [PATCH] mtd: pxa3xx_nand: add cmdline part parser support

NACK, you remove already working cmdline support in you patch 1. Please drop this patch.

cheers, Marc

Quoted 57 lines
---
 drivers/mtd/nand/pxa3xx_nand.c |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)
drivers/mtd/nand/pxa3xx_nand.c +3 -0
index 2eebd20..793b64c 100644
@@ -349,6 +349,9 @@ static struct pxa3xx_nand_flash __devinitdata
 builtin_flash_types[] = {
 	{ 0, 10, 35, 15, 25, 15, 25, 25000, 0, 60, 10, }, },
 };
 
+#ifdef CONFIG_MTD_CMDLINE_PARTS
+static const char *part_probes[] = { "cmdlinepart", NULL };
+#endif
 static const char *mtd_names[] = {"pxa3xx_nand-0", "pxa3xx_nand-1", NULL};
 

/* convert nano-seconds to nand flash controller clock cycles */

drivers/mtd/nand/pxa3xx_nand.c +4 -0
@@ -1726,6 +1729,10 @@ static int __devinit pxa3xx_nand_probe(struct
 platform_device *pdev)
 	struct pxa3xx_nand *nand;
 	struct mtd_info *mtd;
 	int ret, cs, probe_success = 0;
+#ifdef CONFIG_MTD_PARTITIONS
+	struct mtd_partition *partitions = NULL;
+	int num_part = 0;
+#endif
 
 	pdata = pdev->dev.platform_data;
drivers/mtd/nand/pxa3xx_nand.c +17 -2
 	if (!pdata) {
@@ -1747,8 +1754,23 @@ static int __devinit pxa3xx_nand_probe(struct
 platform_device *pdev)
 			dev_err(&pdev->dev, "failed to scan cs#%d nand\n", cs);
 			continue;
 		}
-		ret = add_mtd_partitions(mtd, pdata->parts[cs],
-				pdata->nr_parts[cs]);
+		mtd->name = mtd_names[cs];
+#ifdef CONFIG_MTD_PARTITIONS
+#ifdef CONFIG_MTD_CMDLINE_PARTS
+		num_part = parse_mtd_partitions(mtd, part_probes, &partitions, 0);
+#endif
+		if (num_part <= 0) {
+			num_part = pdata->nr_parts[cs];
+			partitions = pdata->parts[cs];
+		}
+
+		if (partitions && num_part > 0)
+			ret = add_mtd_partitions(mtd, partitions, num_part);
+		else
+			ret = add_mtd_device(mtd);
+#else
+		ret = add_mtd_device(mtd);
+#endif
 		if (!ret)
 			probe_success = 1;
Quoted 1 line

}

- --

Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkvtL4UACgkQjTAFq1RaXHNwjQCfS/U6+ZQoq8J/CpNpurWppigf PNIAn2jzOk/bi2XjTMCP4M1nDFkX87Er
=4//G
-----END PGP SIGNATURE-----