From patchwork Fri Dec  2 14:40:16 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: pxa2xx-flash.c
Date: Fri, 02 Dec 2011 04:40:16 -0000
From: =?ISO-8859-15?Q?Anders=20M=F8rk-Pedersen?= <amp@frogne.dk>
X-Patchwork-Id: 128888
Message-Id: <4ED8F1600200008E00014323@mail.frogne.dk>
To: <linux-mtd@lists.infradead.org>

Hi,

I've noticed a problem with a patch for the pxa2xx-flash.c map, which has been committed to the nextline kernel (currently 3.2-rc3)

The problem is that hardcoded mtd partitions are no longer probed - and that breaks a lot of board support modules.

The patch is described as 
"mtd: pxa2xx-flash.c: use mtd_device_parse_register"

and can be seen here: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=6fcdc92fce81eadcee262a7a66bf3207314fab87

I have created a small patch to address this.

Best regards
Anders Mork-Pedersen <amp@frogne.dk>
Finn Frogne A/S


diff -Nur linux-3.2-rc3/drivers/mtd/maps//pxa2xx-flash.c linux-3.2-rc3_patched/drivers/mtd/maps//pxa2xx-flash.c
--- linux-3.2-rc3/drivers/mtd/maps//pxa2xx-flash.c	2011-11-24 05:20:28.000000000 +0100
+++ linux-3.2-rc3_patched/drivers/mtd/maps//pxa2xx-flash.c	2011-12-02 12:50:38.000000000 +0100
@@ -54,6 +54,7 @@
 	struct flash_platform_data *flash = pdev->dev.platform_data;
 	struct pxa2xx_flash_info *info;
 	struct resource *res;
+	struct mtd_part_parser_data	ppdata;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res)
@@ -98,7 +99,10 @@
 	}
 	info->mtd->owner = THIS_MODULE;
 
-	mtd_device_parse_register(info->mtd, probes, 0, NULL, 0);
+	ppdata.of_node = pdev->dev.of_node;
+	mtd_device_parse_register(info->mtd, probes, &ppdata,
+			flash ? flash->parts : NULL,
+			flash ? flash->nr_parts : 0);
 
 	platform_set_drvdata(pdev, info);
 	return 0;