瀏覽代碼

ARM: Fix gen_nand probe structures contents

These three platforms didn't properly fill nr_chips in gen_nand 
registration and therefore depended on gen_nand bug fixed by commit 
81cbb0b17796d81cbd92defe113cf2a7c7a21fbb ("mtd: gen_nand: fix support for 
multiple chips")

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Marek Vasut 15 年之前
父節點
當前提交
ef077179a2
共有 3 個文件被更改,包括 3 次插入0 次删除
  1. 1 0
      arch/arm/mach-ixp4xx/ixdp425-setup.c
  2. 1 0
      arch/arm/mach-mx3/mach-qong.c
  3. 1 0
      arch/arm/mach-orion5x/ts78xx-setup.c

+ 1 - 0
arch/arm/mach-ixp4xx/ixdp425-setup.c

@@ -100,6 +100,7 @@ ixdp425_flash_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 
 static struct platform_nand_data ixdp425_flash_nand_data = {
 	.chip = {
+		.nr_chips		= 1,
 		.chip_delay		= 30,
 		.options		= NAND_NO_AUTOINCR,
 #ifdef CONFIG_MTD_PARTITIONS

+ 1 - 0
arch/arm/mach-mx3/mach-qong.c

@@ -165,6 +165,7 @@ static void qong_nand_select_chip(struct mtd_info *mtd, int chip)
 
 static struct platform_nand_data qong_nand_data = {
 	.chip = {
+		.nr_chips		= 1,
 		.chip_delay		= 20,
 		.options		= 0,
 	},

+ 1 - 0
arch/arm/mach-orion5x/ts78xx-setup.c

@@ -216,6 +216,7 @@ static struct mtd_partition ts78xx_ts_nand_parts[] = {
 
 static struct platform_nand_data ts78xx_ts_nand_data = {
 	.chip	= {
+		.nr_chips		= 1,
 		.part_probe_types	= ts_nand_part_probes,
 		.partitions		= ts78xx_ts_nand_parts,
 		.nr_partitions		= ARRAY_SIZE(ts78xx_ts_nand_parts),