Add Amstrad Delta NAND support.
Subsystems (2)
PATCH 1/1 Add Amstrad Delta NAND support.
The patch below adds support for the NAND device on the Amstrad Delta. This is a 32MB 8bit Toshiba device, with the data bus connected to the OMAP MPUIO pins and ALE, CLE, NCE, NRE, NWE and NWP all connected to the Delta's latch2 16bit latch.
This is the same patch as submitted to linux-mtd for comments a month ago, with 3 changes:
* Set ams_delta_mtd->owner = THIS_MODULE; before calling nand_scan()
* Remove spurious comment.
* Lower udelay length.
Patch is against vanilla 2.6.17-rc4.
-----
drivers/mtd/nand/ams-delta.c +239 -0
@@ -0,0 +1,239 @@ +/* +* drivers/mtd/nand/ams-delta.c +* +* Copyright (C) 2006 Jonathan McDowell <[email protected]> +* +* Derived from drivers/mtd/toto.c +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* Overview: +* This is a device driver for the NAND flash device found on the +* Amstrad E3 (Delta). +*/ + +#include <linux/slab.h> +#include <linux/init.h> +#include <linux/module.h> +#include <linux/delay.h> +#include <linux/mtd/mtd.h> +#include <linux/mtd/nand.h> +#include <linux/mtd/partitions.h> +#include <asm/io.h> +#include <asm/arch/hardware.h> +#include <asm/sizes.h> +#include <asm/arch/gpio.h> +#include <asm/arch/board-ams-delta.h> + +/* +* MTD structure for E3 (Delta) +*/ +static struct mtd_info *ams_delta_mtd =NULL ; + +#define NAND_MASK (AMS_DELTA_LATCH2_NAND_NRE | AMS_DELTA_LATCH2_NAND_NWE | AMS_DELTA_LATCH2_NAND_CLE | AMS_DELTA_LATCH2_NAND_ALE | AMS_DELTA_LATCH2_NAND_NCE | AMS_DELTA_LATCH2_NAND_NWP) + +#define T_NAND_CTL_CLRALE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_ALE, 0) +#define T_NAND_CTL_SETALE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_ALE, AMS_DELTA_LATCH2_NAND_ALE) +#define T_NAND_CTL_CLRCLE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_CLE, 0) +#define T_NAND_CTL_SETCLE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_CLE, AMS_DELTA_LATCH2_NAND_CLE) +#define T_NAND_CTL_SETNCE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NCE, 0) +#define T_NAND_CTL_CLRNCE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NCE, AMS_DELTA_LATCH2_NAND_NCE) + +/* +* Define partitions for flash devices +*/ + +static struct mtd_partition partition_info[] = { + { .name ="Kernel" , + .offset =0 , + .size =3 *SZ_1M +SZ_512K }, + { .name ="u-boot" , + .offset =3 *SZ_1M +SZ_512K , + .size =SZ_256K }, + { .name ="u-boot params" , + .offset =3 *SZ_1M +SZ_512K +SZ_256K , + .size =SZ_256K }, + { .name ="Amstrad LDR" , + .offset =4 *SZ_1M , + .size =SZ_256K }, + { .name ="File system" , + .offset =4 *SZ_1M +1 *SZ_256K , + .size =27 *SZ_1M }, + { .name ="PBL reserved" , + .offset =32 *SZ_1M -3 *SZ_256K , + .size =3 *SZ_256K }, +}; + +/* +* hardware specific access to control-lines +*/ + +static void ams_delta_hwcontrol (struct mtd_info *mtd,int cmd) +{ +switch (cmd){ + +case NAND_CTL_SETCLE :T_NAND_CTL_SETCLE (cmd);break ; +case NAND_CTL_CLRCLE :T_NAND_CTL_CLRCLE (cmd);break ; + +case NAND_CTL_SETALE :T_NAND_CTL_SETALE (cmd);break ; +case NAND_CTL_CLRALE :T_NAND_CTL_CLRALE (cmd);break ; + +case NAND_CTL_SETNCE :T_NAND_CTL_SETNCE (cmd);break ; +case NAND_CTL_CLRNCE :T_NAND_CTL_CLRNCE (cmd);break ; + } +} + +static void ams_delta_write_byte (struct mtd_info *mtd,u_char byte) +{ +struct nand_chip *this = mtd->priv; + +omap_writew (0 , (OMAP_MPUIO_BASE +OMAP_MPUIO_IO_CNTL )); +omap_writew (byte, this->IO_ADDR_W); +ams_delta_latch2_write (AMS_DELTA_LATCH2_NAND_NWE ,0 ); +udelay (0.04 ); +ams_delta_latch2_write (AMS_DELTA_LATCH2_NAND_NWE , +AMS_DELTA_LATCH2_NAND_NWE ); +} + +static u_char ams_delta_read_byte (struct mtd_info *mtd) +{ +u_char res; +struct nand_chip *this = mtd->priv; + +ams_delta_latch2_write (AMS_DELTA_LATCH2_NAND_NRE ,0 ); +udelay (0.04 ); +omap_writew (~0 , (OMAP_MPUIO_BASE +OMAP_MPUIO_IO_CNTL )); + res =omap_readw (this->IO_ADDR_R); +ams_delta_latch2_write (AMS_DELTA_LATCH2_NAND_NRE , +AMS_DELTA_LATCH2_NAND_NRE ); + +return res; +} + +static void ams_delta_write_buf (struct mtd_info *mtd,const u_char *buf, +int len) +{ +int i; + +for (i=0 ; i<len; i++) +ams_delta_write_byte (mtd, buf[i]); +} + +static void ams_delta_read_buf (struct mtd_info *mtd,u_char *buf,int len) +{ +int i; + +for (i=0 ; i<len; i++) + buf[i] =ams_delta_read_byte (mtd); +} + +static int ams_delta_verify_buf (struct mtd_info *mtd,const u_char *buf, +int len) +{ +int i; + +for (i=0 ; i<len; i++) +if (buf[i] !=ams_delta_read_byte (mtd)) +return -EFAULT ; + +return 0 ; +} + +static int ams_delta_nand_ready (struct mtd_info *mtd) +{ +return omap_get_gpio_datain (AMS_DELTA_GPIO_PIN_NAND_RB ); +} + +/* +* Main initialization routine +*/ +int __init ams_delta_init (void ) +{ +struct nand_chip *this; +int err =0 ; + +/* Allocate memory for MTD device structure and private data */ + ams_delta_mtd =kmalloc (sizeof (struct mtd_info ) + +sizeof (struct nand_chip ),GFP_KERNEL ); +if (!ams_delta_mtd) { +printk (KERN_WARNING +"Unable to allocate E3 NAND MTD device structure.\n" ); + err = -ENOMEM ; + goto out; + } + + ams_delta_mtd->owner =THIS_MODULE ; + +/* Get pointer to private data */ + this = (struct nand_chip *) (&ams_delta_mtd[1 ]); + +/* Initialize structures */ +memset ((char *) ams_delta_mtd,0 ,sizeof (struct mtd_info )); +memset ((char *) this,0 ,sizeof (struct nand_chip )); + +/* Link the private data with the MTD structure */ + ams_delta_mtd->priv = this; + +/* Set address of NAND IO lines */ + this->IO_ADDR_R = (OMAP_MPUIO_BASE +OMAP_MPUIO_INPUT_LATCH ); + this->IO_ADDR_W = (OMAP_MPUIO_BASE +OMAP_MPUIO_OUTPUT ); + this->read_byte = ams_delta_read_byte; + this->write_byte = ams_delta_write_byte; + this->write_buf = ams_delta_write_buf; + this->read_buf = ams_delta_read_buf; + this->verify_buf = ams_delta_verify_buf; + this->hwcontrol = ams_delta_hwcontrol; +if (!omap_request_gpio (AMS_DELTA_GPIO_PIN_NAND_RB )) { + this->dev_ready = ams_delta_nand_ready; + }else { + this->dev_ready =NULL ; +printk (KERN_NOTICE +"Couldn't request gpio for Delta NAND ready.\n" ); + } +/* 25 us command delay time */ + this->chip_delay =30 ; + this->eccmode =NAND_ECC_SOFT ; + +/* Set chip enabled, but */ +ams_delta_latch2_write (NAND_MASK ,AMS_DELTA_LATCH2_NAND_NRE | \ +AMS_DELTA_LATCH2_NAND_NWE | \ +AMS_DELTA_LATCH2_NAND_NCE |AMS_DELTA_LATCH2_NAND_NWP ); + +/* Scan to find existance of the device */ +if (nand_scan (ams_delta_mtd,1 )) { + err = -ENXIO ; + goto out_mtd; + } + +/* Register the partitions */ +add_mtd_partitions (ams_delta_mtd, partition_info, +ARRAY_SIZE (partition_info)); + + goto out; + +out_mtd: +kfree (ams_delta_mtd); +out: +return err; +} + +module_init (ams_delta_init); + +/* +* Clean up routine +*/ +static void __exit ams_delta_cleanup (void) +{ +/* Release resources, unregister device */ +nand_release (ams_delta_mtd); + +/* Free the MTD device structure */ +kfree (ams_delta_mtd); +} +module_exit (ams_delta_cleanup); + +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Jonathan McDowell <[email protected]>" ); +MODULE_DESCRIPTION ("Glue layer for NAND flash on Amstrad E3 (Delta)" );
drivers/mtd/nand/Kconfig +6 -0
@@ -49,6 +49,12 @@ help If you had to ask, you don't have one. Say 'N'. +config MTD_NAND_AMS_DELTA + tristate "NAND Flash device on Amstrad E3" + depends on MACH_AMS_DELTA && MTD_NAND + help + Support for NAND flash on Amstrad E3 (Delta). + config MTD_NAND_TOTO tristate "NAND Flash device on TOTO board" depends on ARCH_OMAP && MTD_NAND
drivers/mtd/nand/Makefile +1 -0
@@ -7,6 +7,7 @@ obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o obj-$(CONFIG_MTD_NAND_SPIA) += spia.o +obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o obj-$(CONFIG_MTD_NAND_TOTO) += toto.o obj-$(CONFIG_MTD_NAND_AUTCPU12) += autcpu12.o obj-$(CONFIG_MTD_NAND_EDB7312) += edb7312.o
-----
J.
Signature · 4 lines
Trust me, you wouldn't like us | .''`. Debian GNU/Linux Developer
when we're angry. | : :' : Happy to accept PGP signed
| `. `' or encrypted mail - RSA +
| `- DSA keys on the keyservers.Review
Quoted 6 lines · Jonathan McDowell
(quoted diff) +2
-0+static struct mtd_info *ams_delta_mtd = NULL; + switch(cmd){
^ ^
Add spaces
drivers/mtd/nand/ams-delta.c line 92
Quoted 1 line
drivers/mtd/nand/ams-delta.c +1
-0+omap_writew (0 , (OMAP_MPUIO_BASE +OMAP_MPUIO_IO_CNTL ));
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Could that be done in a macro?
Review
Quoted 1 line
(quoted diff) +1
-0+ udelay(0.04);
Floating point in the kernel?
drivers/mtd/nand/ams-delta.c line 158
Quoted 1 line
drivers/mtd/nand/ams-delta.c +1
-0+ ams_delta_mtd = kmalloc (sizeof(struct mtd_info) +
^
drivers/mtd/nand/ams-delta.c line 159
Quoted 1 line
drivers/mtd/nand/ams-delta.c +1
-0+ sizeof (struct nand_chip), GFP_KERNEL);
Remove space
And please create a structure containing both struct mtd_info and struct nand_chip. Then use sizeof(that structure)...
drivers/mtd/nand/ams-delta.c line 170
Quoted 2 lines
drivers/mtd/nand/ams-delta.c +2
-0+/* Get pointer to private data */ + this = (struct nand_chip *) (&ams_delta_mtd[1 ]);
...and remove this cast.
drivers/mtd/nand/ams-delta.c line 174
Quoted 3 lines
drivers/mtd/nand/ams-delta.c +3
-0+/* Initialize structures */ +memset ((char *) ams_delta_mtd,0 ,sizeof (struct mtd_info )); +memset ((char *) this,0 ,sizeof (struct nand_chip ));
And those as well, while you're at it.
drivers/mtd/nand/ams-delta.c line 205
Quoted 1 line
drivers/mtd/nand/ams-delta.c +1
-0+if (nand_scan (ams_delta_mtd,1 )) {
^
Review
Quoted 1 line
(quoted diff) +1
-0+ kfree (ams_delta_mtd);
^
Quoted 1 line
+static void
__exitams_delta_cleanup(void)
^
drivers/mtd/nand/ams-delta.c line 230
Quoted 1 line
drivers/mtd/nand/ams-delta.c +1
-0+nand_release (ams_delta_mtd);
^
Review
Quoted 1 line
(quoted diff) +1
-0+ kfree (ams_delta_mtd);
^
Jörn
Signature · 2 lines
Happiness isn't having what you want, it's wanting what you have. -- unknown
Quoted 4 lines · Jörn Engel
drivers/mtd/nand/ams-delta.c line 92
Quoted 1 line · Jonathan McDowell
drivers/mtd/nand/ams-delta.c +1
-0+omap_writew (0 , (OMAP_MPUIO_BASE +OMAP_MPUIO_IO_CNTL ));^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Could that be done in a macro?
Is there any benefit to doing so?
Quoted 3 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ udelay(0.04);Floating point in the kernel?
Not quite. udelay is a macro on ARM so this ends up as an integer before it ever hits a function call. In an ideal world I'd use "ndelay(40);" but that would result in a delay of over 1µs as ARM doesn't have ndelay defined so we hit the generic fallback.
Quoted 8 lines
drivers/mtd/nand/ams-delta.c line 158
Quoted 1 line
drivers/mtd/nand/ams-delta.c +1
-0+ ams_delta_mtd = kmalloc (sizeof(struct mtd_info) +^drivers/mtd/nand/ams-delta.c line 159
Quoted 1 line
drivers/mtd/nand/ams-delta.c +1
-0+ sizeof (struct nand_chip), GFP_KERNEL);Remove space
And please create a structure containing both struct
mtd_infoand structnand_chip. Then use sizeof(that structure)...
This format is used throughout the drivers/mtd/nand/ directory. I'd suggest it'd be more appropriate to have a separate patch that did this for all of them if it's desired, rather than having each driver do its own thing.
Agreed on all the spacing comments you raised; hangovers from toto.c that I used as a base.
J.
Signature · 1 line
I am a passenger.
Quoted 8 lines · Jonathan McDowell
Quoted 4 lines · Jörn Engel
drivers/mtd/nand/ams-delta.c line 92
Quoted 1 line · Jonathan McDowell
drivers/mtd/nand/ams-delta.c +1
-0+omap_writew (0 , (OMAP_MPUIO_BASE +OMAP_MPUIO_IO_CNTL ));^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Could that be done in a macro?
Is there any benefit to doing so?
Quoted 7 lines
Quoted 2 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ udelay(0.04);Floating point in the kernel?
Not quite. udelay is a macro on ARM so this ends up as an integer before it ever hits a function call. In an ideal world I'd use "ndelay(40);" but that would result in a delay of over 1µs as ARM doesn't have ndelay defined so we hit the generic fallback.
Use instead:
/* delay for at least 40 ns */
udelay(1);
Or better yet provide an ndelay implementation for ARM.
David Vrabel
Signature · 4 lines
David Vrabel, Design Engineer Arcom, Clifton Road Tel: +44 (0)1223 411200 ext. 3233 Cambridge CB1 7EA, UK Web: http://www.arcom.com/
Quoted 17 lines · David Vrabel
Quoted 8 lines · Jonathan McDowell
Quoted 4 lines · Jörn Engel
drivers/mtd/nand/ams-delta.c line 92
Quoted 1 line · Jonathan McDowell
drivers/mtd/nand/ams-delta.c +1
-0+omap_writew (0 , (OMAP_MPUIO_BASE +OMAP_MPUIO_IO_CNTL ));^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Could that be done in a macro?
Is there any benefit to doing so?
Quoted 7 lines
Quoted 2 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ udelay(0.04);Floating point in the kernel?
Not quite. udelay is a macro on ARM so this ends up as an integer before it ever hits a function call. In an ideal world I'd use "ndelay(40);" but that would result in a delay of over 1µs as ARM doesn't have ndelay defined so we hit the generic fallback.
Quoted 4 lines
Use instead:
/* delay for at least 40 ns */
udelay(1);
Using "ndelay(40);" here would seem to make more sense; it's equivalent at present and means that once I or someone else provided an ndelay implementation for ARM the driver wouldn't need changed to take advantage of it.
J.
Signature · 4 lines
/------------------------------------\
| Ships log... erm... one. |
| http://www.blackcatnetworks.co.uk/ |
\------------------------------------/Quoted 7 lines · Jonathan McDowell
Quoted 4 lines · Jörn Engel
drivers/mtd/nand/ams-delta.c line 92
Quoted 1 line · Jonathan McDowell
drivers/mtd/nand/ams-delta.c +1
-0+omap_writew (0 , (OMAP_MPUIO_BASE +OMAP_MPUIO_IO_CNTL ));^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Could that be done in a macro?
Is there any benefit to doing so?
Not a big one. A common pattern is to have some defines like
#define FOO_BASE 0x12340000
#define FOO_THIS (FOO_BASE + 0)
#define FOO_THAT (FOO_BASE + 4)
etc.
Your code looks similar to this pattern, so I asked. If it doesn't make sense, fair.
Quoted 6 lines
Quoted 3 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ udelay(0.04);Floating point in the kernel?
Not quite. udelay is a macro on ARM so this ends up as an integer before it ever hits a function call.
Hmm. It does what you say. Whether this is robust and will continue to do so... I'm not sure.
Quoted 3 lines
In an ideal world I'd use "ndelay(40);"
but that would result in a delay of over 1µs as ARM doesn't have ndelay defined so we hit the generic fallback.
Can you either introduce a proper ndelay or get rmk to officially bless your use of (constant, I know) floats in the kernel source? A proper ndelay would obviously be preferred.
Quoted 9 lines
Quoted 8 lines
drivers/mtd/nand/ams-delta.c line 158
Quoted 1 line
drivers/mtd/nand/ams-delta.c +1
-0+ ams_delta_mtd = kmalloc (sizeof(struct mtd_info) +^drivers/mtd/nand/ams-delta.c line 159
Quoted 1 line
drivers/mtd/nand/ams-delta.c +1
-0+ sizeof (struct nand_chip), GFP_KERNEL);Remove space
And please create a structure containing both struct
mtd_infoand structnand_chip. Then use sizeof(that structure)...
Quoted 7 lines
This format is used throughout the
drivers/mtd/nand/directory. I'd suggest it'd be more appropriate to have a separate patch that did this for all of them if it's desired, rather than having each driver do its own thing.Agreed on all the spacing comments you raised; hangovers from
toto.cthat I used as a base.
We have suboptimal code in the kernel, true. I still prefer new code to have slightly higher standards, so the overall quality improves slowly. Therefore, pointing to the other ugly duckling is not an excuse for being mud-covered. ;)
But you are right. The other ducklings could use a bath as well.
Jörn
Signature · 4 lines
There are two ways of constructing a software design: one way is to make it so simple that there are obviously no deficiencies, and the other is to make it so complicated that there are no obvious deficiencies. -- C. A. R. Hoare
Quoted 7 lines · Jörn Engel
Quoted 7 lines
Quoted 2 lines
And please create a structure containing both struct
mtd_infoand structnand_chip. Then use sizeof(that structure)...This format is used throughout the
drivers/mtd/nand/directory. I'd suggest it'd be more appropriate to have a separate patch that did this for all of them if it's desired, rather than having each driver do its own thing.
It's fine as-is. The claim that it's nicer to introduce an extra datatype just for the allocation is subjective, at best.
Quoted 9 lines
Quoted 2 lines
Agreed on all the spacing comments you raised; hangovers from
toto.cthat I used as a base.We have suboptimal code in the kernel, true. I still prefer new code to have slightly higher standards, so the overall quality improves slowly. Therefore, pointing to the other ugly duckling is not an excuse for being mud-covered. ;)
But you are right. The other ducklings could use a bath as well.
They already got it.
Signature · 1 line
dwmw2
Quoted 5 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
And please create a structure containing both struct
mtd_infoand structnand_chip. Then use sizeof(that structure)...It's fine as-is. The claim that it's nicer to introduce an extra datatype just for the allocation is subjective, at best.
Not just for the allocation, but also for getting the address of the second struct, after that allocation.
If the second struct has bigger alignment required than the first, the current code gets the second struct misaligned. Putting both into one bigger struct would add the required padding.
(Say: sizes 4 and 8, alignment requirements 4 and 8 resp.)
Segher
PATCH 1/1 Add Amstrad Delta NAND support.
In reply to Jonathan McDowellQuoted 11 lines · Jonathan McDowell
The patch below adds support for the NAND device on the Amstrad Delta. This is a 32MB 8bit Toshiba device, with the data bus connected to the OMAP MPUIO pins and ALE, CLE, NCE, NRE, NWE and NWP all connected to the Delta's latch2 16bit latch.
This is the same patch as submitted to linux-mtd for comments a month ago, with 3 changes:
* Set
ams_delta_mtd->owner=THIS_MODULE; before callingnand_scan()
* Remove spurious comment.
* Lower udelay length.
Ok, taking the comments on board let's try again.
* Use ndelay(40) instead of udelay(0.04). This will involve a longer delay, but works fine and will take advantage of ndelay once ARM stops using the generic fallback.
* Fixup errant spacing.
* Make ams_delta_init static.
-----
drivers/mtd/nand/ams-delta.c +239 -0
@@ -0,0 +1,239 @@ +/* +* drivers/mtd/nand/ams-delta.c +* +* Copyright (C) 2006 Jonathan McDowell <[email protected]> +* +* Derived from drivers/mtd/toto.c +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* Overview: +* This is a device driver for the NAND flash device found on the +* Amstrad E3 (Delta). +*/ + +#include <linux/slab.h> +#include <linux/init.h> +#include <linux/module.h> +#include <linux/delay.h> +#include <linux/mtd/mtd.h> +#include <linux/mtd/nand.h> +#include <linux/mtd/partitions.h> +#include <asm/io.h> +#include <asm/arch/hardware.h> +#include <asm/sizes.h> +#include <asm/arch/gpio.h> +#include <asm/arch/board-ams-delta.h> + +/* +* MTD structure for E3 (Delta) +*/ +static struct mtd_info *ams_delta_mtd =NULL ; + +#define NAND_MASK (AMS_DELTA_LATCH2_NAND_NRE | AMS_DELTA_LATCH2_NAND_NWE | AMS_DELTA_LATCH2_NAND_CLE | AMS_DELTA_LATCH2_NAND_ALE | AMS_DELTA_LATCH2_NAND_NCE | AMS_DELTA_LATCH2_NAND_NWP) + +#define T_NAND_CTL_CLRALE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_ALE, 0) +#define T_NAND_CTL_SETALE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_ALE, AMS_DELTA_LATCH2_NAND_ALE) +#define T_NAND_CTL_CLRCLE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_CLE, 0) +#define T_NAND_CTL_SETCLE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_CLE, AMS_DELTA_LATCH2_NAND_CLE) +#define T_NAND_CTL_SETNCE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NCE, 0) +#define T_NAND_CTL_CLRNCE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NCE, AMS_DELTA_LATCH2_NAND_NCE) + +/* +* Define partitions for flash devices +*/ + +static struct mtd_partition partition_info[] = { + { .name ="Kernel" , + .offset =0 , + .size =3 *SZ_1M +SZ_512K }, + { .name ="u-boot" , + .offset =3 *SZ_1M +SZ_512K , + .size =SZ_256K }, + { .name ="u-boot params" , + .offset =3 *SZ_1M +SZ_512K +SZ_256K , + .size =SZ_256K }, + { .name ="Amstrad LDR" , + .offset =4 *SZ_1M , + .size =SZ_256K }, + { .name ="File system" , + .offset =4 *SZ_1M +1 *SZ_256K , + .size =27 *SZ_1M }, + { .name ="PBL reserved" , + .offset =32 *SZ_1M -3 *SZ_256K , + .size =3 *SZ_256K }, +}; + +/* +* hardware specific access to control-lines +*/ + +static void ams_delta_hwcontrol (struct mtd_info *mtd,int cmd) +{ +switch (cmd) { + +case NAND_CTL_SETCLE :T_NAND_CTL_SETCLE (cmd);break ; +case NAND_CTL_CLRCLE :T_NAND_CTL_CLRCLE (cmd);break ; + +case NAND_CTL_SETALE :T_NAND_CTL_SETALE (cmd);break ; +case NAND_CTL_CLRALE :T_NAND_CTL_CLRALE (cmd);break ; + +case NAND_CTL_SETNCE :T_NAND_CTL_SETNCE (cmd);break ; +case NAND_CTL_CLRNCE :T_NAND_CTL_CLRNCE (cmd);break ; + } +} + +static void ams_delta_write_byte (struct mtd_info *mtd,u_char byte) +{ +struct nand_chip *this = mtd->priv; + +omap_writew (0 , (OMAP_MPUIO_BASE +OMAP_MPUIO_IO_CNTL )); +omap_writew (byte, this->IO_ADDR_W); +ams_delta_latch2_write (AMS_DELTA_LATCH2_NAND_NWE ,0 ); +ndelay (40 ); +ams_delta_latch2_write (AMS_DELTA_LATCH2_NAND_NWE , +AMS_DELTA_LATCH2_NAND_NWE ); +} + +static u_char ams_delta_read_byte (struct mtd_info *mtd) +{ +u_char res; +struct nand_chip *this = mtd->priv; + +ams_delta_latch2_write (AMS_DELTA_LATCH2_NAND_NRE ,0 ); +ndelay (40 ); +omap_writew (~0 , (OMAP_MPUIO_BASE +OMAP_MPUIO_IO_CNTL )); + res =omap_readw (this->IO_ADDR_R); +ams_delta_latch2_write (AMS_DELTA_LATCH2_NAND_NRE , +AMS_DELTA_LATCH2_NAND_NRE ); + +return res; +} + +static void ams_delta_write_buf (struct mtd_info *mtd,const u_char *buf, +int len) +{ +int i; + +for (i=0 ; i<len; i++) +ams_delta_write_byte (mtd, buf[i]); +} + +static void ams_delta_read_buf (struct mtd_info *mtd,u_char *buf,int len) +{ +int i; + +for (i=0 ; i<len; i++) + buf[i] =ams_delta_read_byte (mtd); +} + +static int ams_delta_verify_buf (struct mtd_info *mtd,const u_char *buf, +int len) +{ +int i; + +for (i=0 ; i<len; i++) +if (buf[i] !=ams_delta_read_byte (mtd)) +return -EFAULT ; + +return 0 ; +} + +static int ams_delta_nand_ready (struct mtd_info *mtd) +{ +return omap_get_gpio_datain (AMS_DELTA_GPIO_PIN_NAND_RB ); +} + +/* +* Main initialization routine +*/ +static int __init ams_delta_init (void ) +{ +struct nand_chip *this; +int err =0 ; + +/* Allocate memory for MTD device structure and private data */ + ams_delta_mtd =kmalloc (sizeof (struct mtd_info ) + +sizeof (struct nand_chip ),GFP_KERNEL ); +if (!ams_delta_mtd) { +printk (KERN_WARNING +"Unable to allocate E3 NAND MTD device structure.\n" ); + err = -ENOMEM ; + goto out; + } + + ams_delta_mtd->owner =THIS_MODULE ; + +/* Get pointer to private data */ + this = (struct nand_chip *) (&ams_delta_mtd[1 ]); + +/* Initialize structures */ +memset ((char *) ams_delta_mtd,0 ,sizeof (struct mtd_info )); +memset ((char *) this,0 ,sizeof (struct nand_chip )); + +/* Link the private data with the MTD structure */ + ams_delta_mtd->priv = this; + +/* Set address of NAND IO lines */ + this->IO_ADDR_R = (OMAP_MPUIO_BASE +OMAP_MPUIO_INPUT_LATCH ); + this->IO_ADDR_W = (OMAP_MPUIO_BASE +OMAP_MPUIO_OUTPUT ); + this->read_byte = ams_delta_read_byte; + this->write_byte = ams_delta_write_byte; + this->write_buf = ams_delta_write_buf; + this->read_buf = ams_delta_read_buf; + this->verify_buf = ams_delta_verify_buf; + this->hwcontrol = ams_delta_hwcontrol; +if (!omap_request_gpio (AMS_DELTA_GPIO_PIN_NAND_RB )) { + this->dev_ready = ams_delta_nand_ready; + }else { + this->dev_ready =NULL ; +printk (KERN_NOTICE +"Couldn't request gpio for Delta NAND ready.\n" ); + } +/* 25 us command delay time */ + this->chip_delay =30 ; + this->eccmode =NAND_ECC_SOFT ; + +/* Set chip enabled, but */ +ams_delta_latch2_write (NAND_MASK ,AMS_DELTA_LATCH2_NAND_NRE | \ +AMS_DELTA_LATCH2_NAND_NWE | \ +AMS_DELTA_LATCH2_NAND_NCE |AMS_DELTA_LATCH2_NAND_NWP ); + +/* Scan to find existance of the device */ +if (nand_scan (ams_delta_mtd,1 )) { + err = -ENXIO ; + goto out_mtd; + } + +/* Register the partitions */ +add_mtd_partitions (ams_delta_mtd, partition_info, +ARRAY_SIZE (partition_info)); + + goto out; + +out_mtd: +kfree (ams_delta_mtd); +out: +return err; +} + +module_init (ams_delta_init); + +/* +* Clean up routine +*/ +static void __exit ams_delta_cleanup(void) +{ +/* Release resources, unregister device */ +nand_release (ams_delta_mtd); + +/* Free the MTD device structure */ +kfree (ams_delta_mtd); +} +module_exit (ams_delta_cleanup); + +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Jonathan McDowell <[email protected]>" ); +MODULE_DESCRIPTION ("Glue layer for NAND flash on Amstrad E3 (Delta)" );
drivers/mtd/nand/Kconfig +6 -0
@@ -49,6 +49,12 @@ help If you had to ask, you don't have one. Say 'N'. +config MTD_NAND_AMS_DELTA + tristate "NAND Flash device on Amstrad E3" + depends on MACH_AMS_DELTA && MTD_NAND + help + Support for NAND flash on Amstrad E3 (Delta). + config MTD_NAND_TOTO tristate "NAND Flash device on TOTO board" depends on ARCH_OMAP && MTD_NAND
drivers/mtd/nand/Makefile +1 -0
@@ -7,6 +7,7 @@ obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o obj-$(CONFIG_MTD_NAND_SPIA) += spia.o +obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o obj-$(CONFIG_MTD_NAND_TOTO) += toto.o obj-$(CONFIG_MTD_NAND_AUTCPU12) += autcpu12.o obj-$(CONFIG_MTD_NAND_EDB7312) += edb7312.o
-----
J.
Signature · 1 line
"Scattered f***ing showers my ass." -- Noah
Quoted 11 lines · Jonathan McDowell
The patch below adds support for the NAND device on the Amstrad Delta. This is a 32MB 8bit Toshiba device, with the data bus connected to the OMAP MPUIO pins and ALE, CLE, NCE, NRE, NWE and NWP all connected to the Delta's latch2 16bit latch.
This is the same patch as submitted to linux-mtd for comments a month ago, with 3 changes:
* Set
ams_delta_mtd->owner=THIS_MODULE; before callingnand_scan()
* Remove spurious comment.
* Lower udelay length.
Ok, taking the comments on board let's try again.
* Use ndelay(40) instead of udelay(0.04). This will involve a longer delay, but works fine and will take advantage of ndelay once ARM stops using the generic fallback.
* Fixup errant spacing.
* Make ams_delta_init static.
-----
drivers/mtd/nand/ams-delta.c +239 -0
@@ -0,0 +1,239 @@ +/* +* drivers/mtd/nand/ams-delta.c +* +* Copyright (C) 2006 Jonathan McDowell <[email protected]> +* +* Derived from drivers/mtd/toto.c +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* Overview: +* This is a device driver for the NAND flash device found on the +* Amstrad E3 (Delta). +*/ + +#include <linux/slab.h> +#include <linux/init.h> +#include <linux/module.h> +#include <linux/delay.h> +#include <linux/mtd/mtd.h> +#include <linux/mtd/nand.h> +#include <linux/mtd/partitions.h> +#include <asm/io.h> +#include <asm/arch/hardware.h> +#include <asm/sizes.h> +#include <asm/arch/gpio.h> +#include <asm/arch/board-ams-delta.h> + +/* +* MTD structure for E3 (Delta) +*/ +static struct mtd_info *ams_delta_mtd =NULL ; + +#define NAND_MASK (AMS_DELTA_LATCH2_NAND_NRE | AMS_DELTA_LATCH2_NAND_NWE | AMS_DELTA_LATCH2_NAND_CLE | AMS_DELTA_LATCH2_NAND_ALE | AMS_DELTA_LATCH2_NAND_NCE | AMS_DELTA_LATCH2_NAND_NWP) + +#define T_NAND_CTL_CLRALE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_ALE, 0) +#define T_NAND_CTL_SETALE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_ALE, AMS_DELTA_LATCH2_NAND_ALE) +#define T_NAND_CTL_CLRCLE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_CLE, 0) +#define T_NAND_CTL_SETCLE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_CLE, AMS_DELTA_LATCH2_NAND_CLE) +#define T_NAND_CTL_SETNCE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NCE, 0) +#define T_NAND_CTL_CLRNCE (iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NCE, AMS_DELTA_LATCH2_NAND_NCE) + +/* +* Define partitions for flash devices +*/ + +static struct mtd_partition partition_info[] = { + { .name ="Kernel" , + .offset =0 , + .size =3 *SZ_1M +SZ_512K }, + { .name ="u-boot" , + .offset =3 *SZ_1M +SZ_512K , + .size =SZ_256K }, + { .name ="u-boot params" , + .offset =3 *SZ_1M +SZ_512K +SZ_256K , + .size =SZ_256K }, + { .name ="Amstrad LDR" , + .offset =4 *SZ_1M , + .size =SZ_256K }, + { .name ="File system" , + .offset =4 *SZ_1M +1 *SZ_256K , + .size =27 *SZ_1M }, + { .name ="PBL reserved" , + .offset =32 *SZ_1M -3 *SZ_256K , + .size =3 *SZ_256K }, +}; + +/* +* hardware specific access to control-lines +*/ + +static void ams_delta_hwcontrol (struct mtd_info *mtd,int cmd) +{ +switch (cmd) { + +case NAND_CTL_SETCLE :T_NAND_CTL_SETCLE (cmd);break ; +case NAND_CTL_CLRCLE :T_NAND_CTL_CLRCLE (cmd);break ; + +case NAND_CTL_SETALE :T_NAND_CTL_SETALE (cmd);break ; +case NAND_CTL_CLRALE :T_NAND_CTL_CLRALE (cmd);break ; + +case NAND_CTL_SETNCE :T_NAND_CTL_SETNCE (cmd);break ; +case NAND_CTL_CLRNCE :T_NAND_CTL_CLRNCE (cmd);break ; + } +} + +static void ams_delta_write_byte (struct mtd_info *mtd,u_char byte) +{ +struct nand_chip *this = mtd->priv; + +omap_writew (0 , (OMAP_MPUIO_BASE +OMAP_MPUIO_IO_CNTL )); +omap_writew (byte, this->IO_ADDR_W); +ams_delta_latch2_write (AMS_DELTA_LATCH2_NAND_NWE ,0 ); +ndelay (40 ); +ams_delta_latch2_write (AMS_DELTA_LATCH2_NAND_NWE , +AMS_DELTA_LATCH2_NAND_NWE ); +} + +static u_char ams_delta_read_byte (struct mtd_info *mtd) +{ +u_char res; +struct nand_chip *this = mtd->priv; + +ams_delta_latch2_write (AMS_DELTA_LATCH2_NAND_NRE ,0 ); +ndelay (40 ); +omap_writew (~0 , (OMAP_MPUIO_BASE +OMAP_MPUIO_IO_CNTL )); + res =omap_readw (this->IO_ADDR_R); +ams_delta_latch2_write (AMS_DELTA_LATCH2_NAND_NRE , +AMS_DELTA_LATCH2_NAND_NRE ); + +return res; +} + +static void ams_delta_write_buf (struct mtd_info *mtd,const u_char *buf, +int len) +{ +int i; + +for (i=0 ; i<len; i++) +ams_delta_write_byte (mtd, buf[i]); +} + +static void ams_delta_read_buf (struct mtd_info *mtd,u_char *buf,int len) +{ +int i; + +for (i=0 ; i<len; i++) + buf[i] =ams_delta_read_byte (mtd); +} + +static int ams_delta_verify_buf (struct mtd_info *mtd,const u_char *buf, +int len) +{ +int i; + +for (i=0 ; i<len; i++) +if (buf[i] !=ams_delta_read_byte (mtd)) +return -EFAULT ; + +return 0 ; +} + +static int ams_delta_nand_ready (struct mtd_info *mtd) +{ +return omap_get_gpio_datain (AMS_DELTA_GPIO_PIN_NAND_RB ); +} + +/* +* Main initialization routine +*/ +static int __init ams_delta_init (void ) +{ +struct nand_chip *this; +int err =0 ; + +/* Allocate memory for MTD device structure and private data */ + ams_delta_mtd =kmalloc (sizeof (struct mtd_info ) + +sizeof (struct nand_chip ),GFP_KERNEL ); +if (!ams_delta_mtd) { +printk (KERN_WARNING +"Unable to allocate E3 NAND MTD device structure.\n" ); + err = -ENOMEM ; + goto out; + } + + ams_delta_mtd->owner =THIS_MODULE ; + +/* Get pointer to private data */ + this = (struct nand_chip *) (&ams_delta_mtd[1 ]); + +/* Initialize structures */ +memset ((char *) ams_delta_mtd,0 ,sizeof (struct mtd_info )); +memset ((char *) this,0 ,sizeof (struct nand_chip )); + +/* Link the private data with the MTD structure */ + ams_delta_mtd->priv = this; + +/* Set address of NAND IO lines */ + this->IO_ADDR_R = (OMAP_MPUIO_BASE +OMAP_MPUIO_INPUT_LATCH ); + this->IO_ADDR_W = (OMAP_MPUIO_BASE +OMAP_MPUIO_OUTPUT ); + this->read_byte = ams_delta_read_byte; + this->write_byte = ams_delta_write_byte; + this->write_buf = ams_delta_write_buf; + this->read_buf = ams_delta_read_buf; + this->verify_buf = ams_delta_verify_buf; + this->hwcontrol = ams_delta_hwcontrol; +if (!omap_request_gpio (AMS_DELTA_GPIO_PIN_NAND_RB )) { + this->dev_ready = ams_delta_nand_ready; + }else { + this->dev_ready =NULL ; +printk (KERN_NOTICE +"Couldn't request gpio for Delta NAND ready.\n" ); + } +/* 25 us command delay time */ + this->chip_delay =30 ; + this->eccmode =NAND_ECC_SOFT ; + +/* Set chip enabled, but */ +ams_delta_latch2_write (NAND_MASK ,AMS_DELTA_LATCH2_NAND_NRE | \ +AMS_DELTA_LATCH2_NAND_NWE | \ +AMS_DELTA_LATCH2_NAND_NCE |AMS_DELTA_LATCH2_NAND_NWP ); + +/* Scan to find existance of the device */ +if (nand_scan (ams_delta_mtd,1 )) { + err = -ENXIO ; + goto out_mtd; + } + +/* Register the partitions */ +add_mtd_partitions (ams_delta_mtd, partition_info, +ARRAY_SIZE (partition_info)); + + goto out; + +out_mtd: +kfree (ams_delta_mtd); +out: +return err; +} + +module_init (ams_delta_init); + +/* +* Clean up routine +*/ +static void __exit ams_delta_cleanup(void) +{ +/* Release resources, unregister device */ +nand_release (ams_delta_mtd); + +/* Free the MTD device structure */ +kfree (ams_delta_mtd); +} +module_exit (ams_delta_cleanup); + +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Jonathan McDowell <[email protected]>" ); +MODULE_DESCRIPTION ("Glue layer for NAND flash on Amstrad E3 (Delta)" );
drivers/mtd/nand/Kconfig +6 -0
@@ -49,6 +49,12 @@ help If you had to ask, you don't have one. Say 'N'. +config MTD_NAND_AMS_DELTA + tristate "NAND Flash device on Amstrad E3" + depends on MACH_AMS_DELTA && MTD_NAND + help + Support for NAND flash on Amstrad E3 (Delta). + config MTD_NAND_TOTO tristate "NAND Flash device on TOTO board" depends on ARCH_OMAP && MTD_NAND
drivers/mtd/nand/Makefile +1 -0
@@ -7,6 +7,7 @@ obj-$(CONFIG_MTD_NAND_IDS) += nand_ids.o obj-$(CONFIG_MTD_NAND_SPIA) += spia.o +obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o obj-$(CONFIG_MTD_NAND_TOTO) += toto.o obj-$(CONFIG_MTD_NAND_AUTCPU12) += autcpu12.o obj-$(CONFIG_MTD_NAND_EDB7312) += edb7312.o
-----
J.
Signature · 1 line
"Scattered f***ing showers my ass." -- Noah
David Woodhouse
AppliedQuoted 7 lines · Jonathan McDowell
Ok, taking the comments on board let's try again.
* Use ndelay(40) instead of udelay(0.04). This will involve a longer delay, but works fine and will take advantage of ndelay once ARM stops using the generic fallback.
* Fixup errant spacing.
* Makeams_delta_initstatic.
Applied; thanks.
Signature · 1 line
dwmw2