[Hackndev-commit] SF.net SVN: hackndev: [1249] linux4palm/linux/trunk

[<mar...@us...>]

Revision: 1249
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1249&view=rev
Author:   marex_z71
Date:     2007-08-20 10:05:21 -0700 (Mon, 20 Aug 2007)

Log Message:
-----------
PalmTX: add some tweaks to still not working NAND flash driver

Modified Paths:
--------------
    linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c
    linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h

Modified: linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c
===================================================================
--- linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c	2007-08-20 16:06:44 UTC (rev 1248)
+++ linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c	2007-08-20 17:05:21 UTC (rev 1249)
@@ -67,7 +67,7 @@
 	struct nand_chip *chip = mtd->priv;
 
 	if (cmd != NAND_CMD_NONE)
-		writeb(cmd, (void __iomem *)((unsigned long)chip->IO_ADDR_W | ((ctrl & 0x6) << 1)));
+		writeb(cmd, (void __iomem *)((unsigned long)chip->IO_ADDR_W));
 }
 
 /*
@@ -118,9 +118,11 @@
 	palmtx_nand_mtd->owner = THIS_MODULE;
 
 	/*
-	 * Enable VPEN
+	 * Enable VPEN ... isnt it on all the time?
 	 */
+#if 0
 	SET_PALMTX_GPIO(NAND_POWER, 1);
+#endif
 
 	/* insert callbacks */
 	this->IO_ADDR_R = nandaddr;

Modified: linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h
===================================================================
--- linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h	2007-08-20 16:06:44 UTC (rev 1248)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h	2007-08-20 17:05:21 UTC (rev 1249)
@@ -19,10 +19,12 @@
 
 #define _INCLUDE_PALMTX_INIT_H_
 
+#include <asm/arch/pxa-regs.h>
+
 /* Various addresses */
 
-#define PALMTX_PHYS_FLASH_START	0x00000000 /* ChipSelect 0 */
-#define PALMTX_PHYS_NAND_START	0x04000000 /* ChipSelect 1 */
+#define PALMTX_PHYS_FLASH_START	PXA_CS0_PHYS	/* ChipSelect 0 */
+#define PALMTX_PHYS_NAND_START	PXA_CS1_PHYS	/* ChipSelect 1 */
 
 #define PALMTX_PHYS_RAM_START	0xa0000000
 #define PALMTX_PHYS_IO_START	0x40000000


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.