diff options
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0127-mtd-nand-pxa3xx-Fix-registered-MTD-name.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.10/0127-mtd-nand-pxa3xx-Fix-registered-MTD-name.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0127-mtd-nand-pxa3xx-Fix-registered-MTD-name.patch b/target/linux/mvebu/patches-3.10/0127-mtd-nand-pxa3xx-Fix-registered-MTD-name.patch new file mode 100644 index 0000000000..b6ae3e62bc --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0127-mtd-nand-pxa3xx-Fix-registered-MTD-name.patch @@ -0,0 +1,48 @@ +From fe013a7a5667763bde164dd5c9341ee5361a9c23 Mon Sep 17 00:00:00 2001 +From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Date: Sat, 19 Oct 2013 18:19:25 -0300 +Subject: [PATCH 127/203] mtd: nand: pxa3xx: Fix registered MTD name + +In a recent commit: + + commit f455578dd961087a5cf94730d9f6489bb1d355f0 + Author: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> + Date: Mon Aug 12 14:14:53 2013 -0300 + + mtd: nand: pxa3xx: Remove hardcoded mtd name + + There's no advantage in using a hardcoded name for the mtd device. + Instead use the provided by the platform_device. + +The MTD name was changed to use the one provided by the platform_device. +However, this can be problematic as some users want to set partitions +using the kernel parameter 'mtdparts', where the name is needed. + +Therefore, to avoid regressions in users relying in 'mtdparts' we revert +the change and use the previous one 'pxa3xx_nand-0'. + +While at it, let's put a big comment and prevent this change from happening +ever again. + +Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Signed-off-by: Brian Norris <computersforpeace@gmail.com> +--- + drivers/mtd/nand/pxa3xx_nand.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/drivers/mtd/nand/pxa3xx_nand.c ++++ b/drivers/mtd/nand/pxa3xx_nand.c +@@ -1320,7 +1320,12 @@ static int pxa3xx_nand_probe(struct plat + for (cs = 0; cs < pdata->num_cs; cs++) { + struct mtd_info *mtd = info->host[cs]->mtd; + +- mtd->name = pdev->name; ++ /* ++ * The mtd name matches the one used in 'mtdparts' kernel ++ * parameter. This name cannot be changed or otherwise ++ * user's mtd partitions configuration would get broken. ++ */ ++ mtd->name = "pxa3xx_nand-0"; + info->cs = cs; + ret = pxa3xx_nand_scan(mtd); + if (ret) { |