diff options
Diffstat (limited to 'arch/arm/mach-ixp4xx/ixdp425-setup.c')
-rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index 108a9d3f382..6a2927956bf 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
@@ -60,6 +60,8 @@ static struct platform_device ixdp425_flash = { | |||
60 | #if defined(CONFIG_MTD_NAND_PLATFORM) || \ | 60 | #if defined(CONFIG_MTD_NAND_PLATFORM) || \ |
61 | defined(CONFIG_MTD_NAND_PLATFORM_MODULE) | 61 | defined(CONFIG_MTD_NAND_PLATFORM_MODULE) |
62 | 62 | ||
63 | const char *part_probes[] = { "cmdlinepart", NULL }; | ||
64 | |||
63 | static struct mtd_partition ixdp425_partitions[] = { | 65 | static struct mtd_partition ixdp425_partitions[] = { |
64 | { | 66 | { |
65 | .name = "ixp400 NAND FS 0", | 67 | .name = "ixp400 NAND FS 0", |
@@ -98,6 +100,8 @@ static struct platform_nand_data ixdp425_flash_nand_data = { | |||
98 | .chip = { | 100 | .chip = { |
99 | .nr_chips = 1, | 101 | .nr_chips = 1, |
100 | .chip_delay = 30, | 102 | .chip_delay = 30, |
103 | .options = NAND_NO_AUTOINCR, | ||
104 | .part_probe_types = part_probes, | ||
101 | .partitions = ixdp425_partitions, | 105 | .partitions = ixdp425_partitions, |
102 | .nr_partitions = ARRAY_SIZE(ixdp425_partitions), | 106 | .nr_partitions = ARRAY_SIZE(ixdp425_partitions), |
103 | }, | 107 | }, |
@@ -250,15 +254,13 @@ static void __init ixdp425_init(void) | |||
250 | MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") | 254 | MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") |
251 | /* Maintainer: MontaVista Software, Inc. */ | 255 | /* Maintainer: MontaVista Software, Inc. */ |
252 | .map_io = ixp4xx_map_io, | 256 | .map_io = ixp4xx_map_io, |
253 | .init_early = ixp4xx_init_early, | ||
254 | .init_irq = ixp4xx_init_irq, | 257 | .init_irq = ixp4xx_init_irq, |
255 | .timer = &ixp4xx_timer, | 258 | .timer = &ixp4xx_timer, |
256 | .atag_offset = 0x100, | 259 | .boot_params = 0x0100, |
257 | .init_machine = ixdp425_init, | 260 | .init_machine = ixdp425_init, |
258 | #if defined(CONFIG_PCI) | 261 | #if defined(CONFIG_PCI) |
259 | .dma_zone_size = SZ_64M, | 262 | .dma_zone_size = SZ_64M, |
260 | #endif | 263 | #endif |
261 | .restart = ixp4xx_restart, | ||
262 | MACHINE_END | 264 | MACHINE_END |
263 | #endif | 265 | #endif |
264 | 266 | ||
@@ -266,10 +268,9 @@ MACHINE_END | |||
266 | MACHINE_START(IXDP465, "Intel IXDP465 Development Platform") | 268 | MACHINE_START(IXDP465, "Intel IXDP465 Development Platform") |
267 | /* Maintainer: MontaVista Software, Inc. */ | 269 | /* Maintainer: MontaVista Software, Inc. */ |
268 | .map_io = ixp4xx_map_io, | 270 | .map_io = ixp4xx_map_io, |
269 | .init_early = ixp4xx_init_early, | ||
270 | .init_irq = ixp4xx_init_irq, | 271 | .init_irq = ixp4xx_init_irq, |
271 | .timer = &ixp4xx_timer, | 272 | .timer = &ixp4xx_timer, |
272 | .atag_offset = 0x100, | 273 | .boot_params = 0x0100, |
273 | .init_machine = ixdp425_init, | 274 | .init_machine = ixdp425_init, |
274 | #if defined(CONFIG_PCI) | 275 | #if defined(CONFIG_PCI) |
275 | .dma_zone_size = SZ_64M, | 276 | .dma_zone_size = SZ_64M, |
@@ -281,10 +282,9 @@ MACHINE_END | |||
281 | MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform") | 282 | MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform") |
282 | /* Maintainer: MontaVista Software, Inc. */ | 283 | /* Maintainer: MontaVista Software, Inc. */ |
283 | .map_io = ixp4xx_map_io, | 284 | .map_io = ixp4xx_map_io, |
284 | .init_early = ixp4xx_init_early, | ||
285 | .init_irq = ixp4xx_init_irq, | 285 | .init_irq = ixp4xx_init_irq, |
286 | .timer = &ixp4xx_timer, | 286 | .timer = &ixp4xx_timer, |
287 | .atag_offset = 0x100, | 287 | .boot_params = 0x0100, |
288 | .init_machine = ixdp425_init, | 288 | .init_machine = ixdp425_init, |
289 | #if defined(CONFIG_PCI) | 289 | #if defined(CONFIG_PCI) |
290 | .dma_zone_size = SZ_64M, | 290 | .dma_zone_size = SZ_64M, |
@@ -296,10 +296,9 @@ MACHINE_END | |||
296 | MACHINE_START(KIXRP435, "Intel KIXRP435 Reference Platform") | 296 | MACHINE_START(KIXRP435, "Intel KIXRP435 Reference Platform") |
297 | /* Maintainer: MontaVista Software, Inc. */ | 297 | /* Maintainer: MontaVista Software, Inc. */ |
298 | .map_io = ixp4xx_map_io, | 298 | .map_io = ixp4xx_map_io, |
299 | .init_early = ixp4xx_init_early, | ||
300 | .init_irq = ixp4xx_init_irq, | 299 | .init_irq = ixp4xx_init_irq, |
301 | .timer = &ixp4xx_timer, | 300 | .timer = &ixp4xx_timer, |
302 | .atag_offset = 0x100, | 301 | .boot_params = 0x0100, |
303 | .init_machine = ixdp425_init, | 302 | .init_machine = ixdp425_init, |
304 | #if defined(CONFIG_PCI) | 303 | #if defined(CONFIG_PCI) |
305 | .dma_zone_size = SZ_64M, | 304 | .dma_zone_size = SZ_64M, |