From: Nils Faerber <nils.faerber@kernelconcepts.de>
Date: Tue, 11 Jan 2011 11:27:25 +0000 (+0100)
Subject: Merge branch 'csb1725' into csb1725-bdt
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=92d5ca51a3feef1019732c41a636398ed7416501;hp=5c1cc2fe38b2987a8c1d7805f72faca56f3724ea;p=mv-sheeva.git

Merge branch 'csb1725' into csb1725-bdt
---

diff --git a/arch/arm/mach-mv78xx0/rdstor-setup.c b/arch/arm/mach-mv78xx0/rdstor-setup.c
index e7f542594a7..648d362be15 100644
--- 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);