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

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

Revision: 1241
          http://hackndev.svn.sourceforge.net/hackndev/?rev=1241&view=rev
Author:   marex_z71
Date:     2007-08-18 12:12:55 -0700 (Sat, 18 Aug 2007)

Log Message:
-----------
PalmTX: move defines to correct place

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-18 16:13:40 UTC (rev 1240)
+++ linux4palm/linux/trunk/drivers/mtd/nand/palmtx.c	2007-08-18 19:12:55 UTC (rev 1241)
@@ -30,8 +30,6 @@
 #include <asm/memory.h>
 #include <asm/mach-types.h>
 
-#define PALMTX_NAND_BASE 0x08000000
-
 /*
  * MTD structure
  */
@@ -93,7 +91,7 @@
 	if (!machine_is_xscale_palmtx())
 		return -ENODEV;
 
-	nandaddr = ioremap(PALMTX_NAND_BASE, 0x1000);
+	nandaddr = ioremap(PALMTX_PHYS_NAND_START, 0x1000);
 	if (!nandaddr) {
 		printk("Failed to ioremap NAND flash.\n");
 		return -ENOMEM;

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-18 16:13:40 UTC (rev 1240)
+++ linux4palm/linux/trunk/include/asm-arm/arch-pxa/palmtx-init.h	2007-08-18 19:12:55 UTC (rev 1241)
@@ -21,9 +21,11 @@
 
 /* Various addresses */
 
-#define PALMTX_PHYS_RAM_START 0xa0000000
-#define PALMTX_PHYS_IO_START  0x40000000
+#define PALMTX_PHYS_FLASH_START	0x00000000 /* ChipSelect 0 */
+#define PALMTX_PHYS_NAND_START	0x04000000 /* ChipSelect 1 */
 
+#define PALMTX_PHYS_RAM_START	0xa0000000
+#define PALMTX_PHYS_IO_START	0x40000000
 
 /* LCD REGISTERS */
 #define PALMTX_INIT_LCD_LLC0	LCCR0_ENB | LCCR0_Color | LCCR0_Sngl | LCCR0_LDM | \


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