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
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 9f27a3899318ef0c4c147ed2d84cfbfb339d9bb6 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Date: Mon, 12 Aug 2013 14:14:52 -0300
|
|
Subject: [PATCH 119/203] mtd: nand: pxa3xx: Add a local loop variable
|
|
|
|
This is just a cosmetic change, to make the code more readable.
|
|
|
|
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
|
|
Tested-by: Daniel Mack <zonque@gmail.com>
|
|
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
|
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
|
|
---
|
|
drivers/mtd/nand/pxa3xx_nand.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/mtd/nand/pxa3xx_nand.c
|
|
+++ b/drivers/mtd/nand/pxa3xx_nand.c
|
|
@@ -1320,8 +1320,9 @@ static int pxa3xx_nand_probe(struct plat
|
|
info->variant = pxa3xx_nand_get_variant(pdev);
|
|
probe_success = 0;
|
|
for (cs = 0; cs < pdata->num_cs; cs++) {
|
|
+ struct mtd_info *mtd = info->host[cs]->mtd;
|
|
info->cs = cs;
|
|
- ret = pxa3xx_nand_scan(info->host[cs]->mtd);
|
|
+ ret = pxa3xx_nand_scan(mtd);
|
|
if (ret) {
|
|
dev_warn(&pdev->dev, "failed to scan nand at cs %d\n",
|
|
cs);
|
|
@@ -1329,7 +1330,7 @@ static int pxa3xx_nand_probe(struct plat
|
|
}
|
|
|
|
ppdata.of_node = pdev->dev.of_node;
|
|
- ret = mtd_device_parse_register(info->host[cs]->mtd, NULL,
|
|
+ ret = mtd_device_parse_register(mtd, NULL,
|
|
&ppdata, pdata->parts[cs],
|
|
pdata->nr_parts[cs]);
|
|
if (!ret)
|