aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2010-08-11 21:14:54 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-08-11 21:21:18 -0400
commitef077179a2909d3d0d3accf29ad1ea9ebb19019b (patch)
tree93fdf0f9bc28512a5fd908756fa927728552bdb2
parentdb9ebb7cd0b6329c46ba3cc326d6414647fcfe6b (diff)
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>
-rw-r--r--arch/arm/mach-ixp4xx/ixdp425-setup.c1
-rw-r--r--arch/arm/mach-mx3/mach-qong.c1
-rw-r--r--arch/arm/mach-orion5x/ts78xx-setup.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 827cbc4402f4..ea9ee4ed0a3e 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/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)
100 100
101static struct platform_nand_data ixdp425_flash_nand_data = { 101static struct platform_nand_data ixdp425_flash_nand_data = {
102 .chip = { 102 .chip = {
103 .nr_chips = 1,
103 .chip_delay = 30, 104 .chip_delay = 30,
104 .options = NAND_NO_AUTOINCR, 105 .options = NAND_NO_AUTOINCR,
105#ifdef CONFIG_MTD_PARTITIONS 106#ifdef CONFIG_MTD_PARTITIONS
diff --git a/arch/arm/mach-mx3/mach-qong.c b/arch/arm/mach-mx3/mach-qong.c
index d44ac70222a5..c8c380eef74c 100644
--- a/arch/arm/mach-mx3/mach-qong.c
+++ b/arch/arm/mach-mx3/mach-qong.c
@@ -165,6 +165,7 @@ static void qong_nand_select_chip(struct mtd_info *mtd, int chip)
165 165
166static struct platform_nand_data qong_nand_data = { 166static struct platform_nand_data qong_nand_data = {
167 .chip = { 167 .chip = {
168 .nr_chips = 1,
168 .chip_delay = 20, 169 .chip_delay = 20,
169 .options = 0, 170 .options = 0,
170 }, 171 },
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 5041d1bc26b1..696b1a97f9e2 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -216,6 +216,7 @@ static struct mtd_partition ts78xx_ts_nand_parts[] = {
216 216
217static struct platform_nand_data ts78xx_ts_nand_data = { 217static struct platform_nand_data ts78xx_ts_nand_data = {
218 .chip = { 218 .chip = {
219 .nr_chips = 1,
219 .part_probe_types = ts_nand_part_probes, 220 .part_probe_types = ts_nand_part_probes,
220 .partitions = ts78xx_ts_nand_parts, 221 .partitions = ts78xx_ts_nand_parts,
221 .nr_partitions = ARRAY_SIZE(ts78xx_ts_nand_parts), 222 .nr_partitions = ARRAY_SIZE(ts78xx_ts_nand_parts),