3af779eb17
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12. This work mainly covers: * Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family,and the Armada family. * Further updates to the mvebu MBus. * Work and ground work for enabling MSI on the Armada family. * some phy / mdio bus initialization related work. * Device tree binding documentation update. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39565
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
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) {
|