Patched in Tegra support.

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 = {
 #if defined(CONFIG_MTD_NAND_PLATFORM) || \
     defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
 
+const char *part_probes[] = { "cmdlinepart", NULL };
+
 static struct mtd_partition ixdp425_partitions[] = {
         {
                 .name   = "ixp400 NAND FS 0",
@@ -98,6 +100,8 @@ static struct platform_nand_data ixdp425_flash_nand_data = {
         .chip = {
                 .nr_chips               = 1,
                 .chip_delay             = 30,
+                .options                = NAND_NO_AUTOINCR,
+                .part_probe_types       = part_probes,
                 .partitions             = ixdp425_partitions,
                 .nr_partitions          = ARRAY_SIZE(ixdp425_partitions),
         },
@@ -250,15 +254,13 @@ static void __init ixdp425_init(void)
 MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
         /* Maintainer: MontaVista Software, Inc. */
         .map_io         = ixp4xx_map_io,
-        .init_early     = ixp4xx_init_early,
         .init_irq       = ixp4xx_init_irq,
         .timer          = &ixp4xx_timer,
-        .atag_offset    = 0x100,
+        .boot_params    = 0x0100,
         .init_machine   = ixdp425_init,
 #if defined(CONFIG_PCI)
         .dma_zone_size  = SZ_64M,
 #endif
-        .restart        = ixp4xx_restart,
 MACHINE_END
 #endif
 
@@ -266,10 +268,9 @@ MACHINE_END
 MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")
         /* Maintainer: MontaVista Software, Inc. */
         .map_io         = ixp4xx_map_io,
-        .init_early     = ixp4xx_init_early,
         .init_irq       = ixp4xx_init_irq,
         .timer          = &ixp4xx_timer,
-        .atag_offset    = 0x100,
+        .boot_params    = 0x0100,
         .init_machine   = ixdp425_init,
 #if defined(CONFIG_PCI)
         .dma_zone_size  = SZ_64M,
@@ -281,10 +282,9 @@ MACHINE_END
 MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
         /* Maintainer: MontaVista Software, Inc. */
         .map_io         = ixp4xx_map_io,
-        .init_early     = ixp4xx_init_early,
         .init_irq       = ixp4xx_init_irq,
         .timer          = &ixp4xx_timer,
-        .atag_offset    = 0x100,
+        .boot_params    = 0x0100,
         .init_machine   = ixdp425_init,
 #if defined(CONFIG_PCI)
         .dma_zone_size  = SZ_64M,
@@ -296,10 +296,9 @@ MACHINE_END
 MACHINE_START(KIXRP435, "Intel KIXRP435 Reference Platform")
         /* Maintainer: MontaVista Software, Inc. */
         .map_io         = ixp4xx_map_io,
-        .init_early     = ixp4xx_init_early,
         .init_irq       = ixp4xx_init_irq,
         .timer          = &ixp4xx_timer,
-        .atag_offset    = 0x100,
+        .boot_params    = 0x0100,
         .init_machine   = ixdp425_init,
 #if defined(CONFIG_PCI)
         .dma_zone_size  = SZ_64M,