Remove no longer necessary NAND fixups (needs most recent UBoot)

diff --git a/arch/arm/mach-mv78xx0/rdstor-setup.c b/arch/arm/mach-mv78xx0/rdstor-setup.c
index e7f542594a7ba317c42cdb3514897123d28eab22..648d362be15fad9ffd57d74f76783574fe89cc22 100644 (file)
--- a/arch/arm/mach-mv78xx0/rdstor-setup.c
+++ b/arch/arm/mach-mv78xx0/rdstor-setup.c
@@ -311,15 +311,13 @@ static void __init db78x00_init(void)
                platform_device_register(&rdstor_mtd_device);
 
                /* NAND flash */
-               #if 1
+#if 1
                printk(KERN_ERR "NAND read params:  0x%08x\n", readl(MV78XX0_REGS_VIRT_BASE | 0x10418));
                printk(KERN_ERR "NAND write params: 0x%08x\n", readl(MV78XX0_REGS_VIRT_BASE | 0x1041C));
                printk(KERN_ERR "NAND control:      0x%08x\n", readl(MV78XX0_REGS_VIRT_BASE | 0x10470));
-               #endif
-               writel(0xfff40 /*0x07d940*/, MV78XX0_REGS_VIRT_BASE | 0x10470);
-               printk(KERN_ERR "NAND control:      0x%08x\n", readl(MV78XX0_REGS_VIRT_BASE | 0x10470));
+#endif
 
-               if (/*1 ||*/ gpio_request(16, "NAND READY") != 0 ||
+               if (gpio_request(16, "NAND READY") != 0 ||
                    gpio_direction_input(16) != 0) {
                        printk(KERN_ERR "nand_init: failed to request GPIO16 for NAND_READY, falling back to udelay\n");
                        mv78xx0_nand_init(ARRAY_AND_SIZE(rdstor_nand_parts), 30);