Skip to content

L
linux-davinci
Commit 2c0a2bed authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files
Options

[MTD] NAND whitespace and formatting cleanup 

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent dcb09328
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 111 deletions
drivers/mtd/nand/nand_base.c
View file @ 2c0a2bed
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* http://www.linux-mtd.infradead.org/tech/nand.html * http://www.linux-mtd.infradead.org/tech/nand.html
* *
* Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com) * Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
* 2002 Thomas Gleixner (tglx@linutronix.de) * 2002 Thomas Gleixner (tglx@linutronix.de)
* *
* 02-08-2004 tglx: support for strange chips, which cannot auto increment * 02-08-2004 tglx: support for strange chips, which cannot auto increment
* pages on read / read_oob * pages on read / read_oob
...@@ -25,26 +25,30 @@ ...@@ -25,26 +25,30 @@
* 05-19-2004 tglx: Basic support for Renesas AG-AND chips * 05-19-2004 tglx: Basic support for Renesas AG-AND chips
* *
* 09-24-2004 tglx: add support for hardware controllers (e.g. ECC) shared * 09-24-2004 tglx: add support for hardware controllers (e.g. ECC) shared
* among multiple independend devices. Suggestions and initial patch * among multiple independend devices. Suggestions and initial
* from Ben Dooks <ben-mtd@fluff.org> * patch from Ben Dooks <ben-mtd@fluff.org>
* *
* 12-05-2004 dmarlin: add workaround for Renesas AG-AND chips "disturb" issue. * 12-05-2004 dmarlin: add workaround for Renesas AG-AND chips "disturb"
* Basically, any block not rewritten may lose data when surrounding blocks * issue. Basically, any block not rewritten may lose data when
* are rewritten many times. JFFS2 ensures this doesn't happen for blocks * surrounding blocks are rewritten many times. JFFS2 ensures
* it uses, but the Bad Block Table(s) may not be rewritten. To ensure they * this doesn't happen for blocks it uses, but the Bad Block
* do not lose data, force them to be rewritten when some of the surrounding * Table(s) may not be rewritten. To ensure they do not lose
* blocks are erased. Rather than tracking a specific nearby block (which * data, force them to be rewritten when some of the surrounding
* could itself go bad), use a page address 'mask' to select several blocks * blocks are erased. Rather than tracking a specific nearby
* in the same area, and rewrite the BBT when any of them are erased. * block (which could itself go bad), use a page address 'mask' to
* * select several blocks in the same area, and rewrite the BBT
* 01-03-2005 dmarlin: added support for the device recovery command sequence for Renesas * when any of them are erased.
* AG-AND chips. If there was a sudden loss of power during an erase operation, *
* a "device recovery" operation must be performed when power is restored * 01-03-2005 dmarlin: added support for the device recovery command sequence
* to ensure correct operation. * for Renesas AG-AND chips. If there was a sudden loss of power
* * during an erase operation, a "device recovery" operation must
* 01-20-2005 dmarlin: added support for optional hardware specific callback routine to * be performed when power is restored to ensure correct
* perform extra error status checks on erase and write failures. This required * operation.
* adding a wrapper function for nand_read_ecc. *
* 01-20-2005 dmarlin: added support for optional hardware specific callback
* routine to perform extra error status checks on erase and write
* failures. This required adding a wrapper function for
* nand_read_ecc.
* *
* 08-20-2005 vwool: suspend/resume added * 08-20-2005 vwool: suspend/resume added
* *
...@@ -132,32 +136,43 @@ static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len); ...@@ -132,32 +136,43 @@ static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len);
static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len); static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len);
static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len); static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len);
static int nand_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf); static int nand_read(struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, u_char *buf);
static int nand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len, static int nand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel); size_t *retlen, u_char *buf, u_char *eccbuf,
static int nand_read_oob(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf); struct nand_oobinfo *oobsel);
static int nand_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf); static int nand_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, u_char *buf);
static int nand_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf);
static int nand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len, static int nand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel); size_t *retlen, const u_char *buf, u_char *eccbuf,
static int nand_write_oob(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf); struct nand_oobinfo *oobsel);
static int nand_writev(struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, loff_t to, size_t *retlen); static int nand_write_oob(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf);
static int nand_writev(struct mtd_info *mtd, const struct kvec *vecs,
unsigned long count, loff_t to, size_t *retlen);
static int nand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs, static int nand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
unsigned long count, loff_t to, size_t *retlen, u_char *eccbuf, unsigned long count, loff_t to, size_t *retlen,
struct nand_oobinfo *oobsel); u_char *eccbuf, struct nand_oobinfo *oobsel);
static int nand_erase(struct mtd_info *mtd, struct erase_info *instr); static int nand_erase(struct mtd_info *mtd, struct erase_info *instr);
static void nand_sync(struct mtd_info *mtd); static void nand_sync(struct mtd_info *mtd);
/* Some internal functions */ /* Some internal functions */
static int nand_write_page(struct mtd_info *mtd, struct nand_chip *this, int page, u_char * oob_buf, static int nand_write_page(struct mtd_info *mtd, struct nand_chip *this,
int page, u_char * oob_buf,
struct nand_oobinfo *oobsel, int mode); struct nand_oobinfo *oobsel, int mode);
#ifdef CONFIG_MTD_NAND_VERIFY_WRITE #ifdef CONFIG_MTD_NAND_VERIFY_WRITE
static int nand_verify_pages(struct mtd_info *mtd, struct nand_chip *this, int page, int numpages, static int nand_verify_pages(struct mtd_info *mtd, struct nand_chip *this,
u_char *oob_buf, struct nand_oobinfo *oobsel, int chipnr, int oobmode); int page, int numpages, u_char *oob_buf,
struct nand_oobinfo *oobsel, int chipnr,
int oobmode);
#else #else
#define nand_verify_pages(...) (0) #define nand_verify_pages(...) (0)
#endif #endif
static int nand_get_device(struct nand_chip *this, struct mtd_info *mtd, int new_state); static int nand_get_device(struct nand_chip *this, struct mtd_info *mtd,
int new_state);
/** /**
* nand_release_device - [GENERIC] release chip * nand_release_device - [GENERIC] release chip
...@@ -424,14 +439,16 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip) ...@@ -424,14 +439,16 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
page = (int)ofs; page = (int)ofs;
if (this->options & NAND_BUSWIDTH_16) { if (this->options & NAND_BUSWIDTH_16) {
this->cmdfunc(mtd, NAND_CMD_READOOB, this->badblockpos & 0xFE, page & this->pagemask); this->cmdfunc(mtd, NAND_CMD_READOOB, this->badblockpos & 0xFE,
page & this->pagemask);
bad = cpu_to_le16(this->read_word(mtd)); bad = cpu_to_le16(this->read_word(mtd));
if (this->badblockpos & 0x1) if (this->badblockpos & 0x1)
bad >>= 8; bad >>= 8;
if ((bad & 0xFF) != 0xff) if ((bad & 0xFF) != 0xff)
res = 1; res = 1;
} else { } else {
this->cmdfunc(mtd, NAND_CMD_READOOB, this->badblockpos, page & this->pagemask); this->cmdfunc(mtd, NAND_CMD_READOOB, this->badblockpos,
page & this->pagemask);
if (this->read_byte(mtd) != 0xff) if (this->read_byte(mtd) != 0xff)
res = 1; res = 1;
} }
...@@ -498,7 +515,8 @@ static int nand_check_wp(struct mtd_info *mtd) ...@@ -498,7 +515,8 @@ static int nand_check_wp(struct mtd_info *mtd)
* Check, if the block is bad. Either by reading the bad block table or * Check, if the block is bad. Either by reading the bad block table or
* calling of the scan function. * calling of the scan function.
*/ */
static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip, int allowbbt) static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip,
int allowbbt)
{ {
struct nand_chip *this = mtd->priv; struct nand_chip *this = mtd->priv;
...@@ -540,7 +558,8 @@ static void nand_wait_ready(struct mtd_info *mtd) ...@@ -540,7 +558,8 @@ static void nand_wait_ready(struct mtd_info *mtd)
* Send command to NAND device. This function is used for small page * Send command to NAND device. This function is used for small page
* devices (256/512 Bytes per page) * devices (256/512 Bytes per page)
*/ */
static void nand_command(struct mtd_info *mtd, unsigned command, int column, int page_addr) static void nand_command(struct mtd_info *mtd, unsigned command, int column,
int page_addr)
{ {
register struct nand_chip *this = mtd->priv; register struct nand_chip *this = mtd->priv;
...@@ -755,7 +774,8 @@ static void nand_command_lp(struct mtd_info *mtd, unsigned command, int column, ...@@ -755,7 +774,8 @@ static void nand_command_lp(struct mtd_info *mtd, unsigned command, int column,
* *
* Get the device and lock it for exclusive access * Get the device and lock it for exclusive access
*/ */
static int nand_get_device(struct nand_chip *this, struct mtd_info *mtd, int new_state) static int
nand_get_device(struct nand_chip *this, struct mtd_info *mtd, int new_state)
{ {
spinlock_t *lock = &this->controller->lock; spinlock_t *lock = &this->controller->lock;
wait_queue_head_t *wq = &this->controller->wq; wait_queue_head_t *wq = &this->controller->wq;
...@@ -942,7 +962,7 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *this, int pag ...@@ -942,7 +962,7 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *this, int pag
* nand_verify_pages - [GENERIC] verify the chip contents after a write * nand_verify_pages - [GENERIC] verify the chip contents after a write
* @mtd: MTD device structure * @mtd: MTD device structure
* @this: NAND chip structure * @this: NAND chip structure
* @page: startpage inside the chip, must be called with (page & this->pagemask) * @page: startpage inside the chip, must be called with (page & this->pagemask)
* @numpages: number of pages to verify * @numpages: number of pages to verify
* @oob_buf: out of band data buffer * @oob_buf: out of band data buffer
* @oobsel: out of band selecttion structre * @oobsel: out of band selecttion structre
...@@ -2293,8 +2313,8 @@ static void nand_resume(struct mtd_info *mtd) ...@@ -2293,8 +2313,8 @@ static void nand_resume(struct mtd_info *mtd)
if (this->state == FL_PM_SUSPENDED) if (this->state == FL_PM_SUSPENDED)
nand_release_device(mtd); nand_release_device(mtd);
else else
printk(KERN_ERR "resume() called for the chip which is not in suspended state\n"); printk(KERN_ERR "nand_resume() called for a chip which is not "
"in suspended state\n");
} }
/* /*
......
include/linux/mtd/nand.h
View file @ 2c0a2bed
...@@ -11,47 +11,11 @@ ...@@ -11,47 +11,11 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
* *
* Info: * Info:
* Contains standard defines and IDs for NAND flash devices * Contains standard defines and IDs for NAND flash devices
* *
* Changelog: * Changelog:
* 01-31-2000 DMW Created * See git changelog.
* 09-18-2000 SJH Moved structure out of the Disk-On-Chip drivers
* so it can be used by other NAND flash device
* drivers. I also changed the copyright since none
* of the original contents of this file are specific
* to DoC devices. David can whack me with a baseball
* bat later if I did something naughty.
* 10-11-2000 SJH Added private NAND flash structure for driver
* 10-24-2000 SJH Added prototype for 'nand_scan' function
* 10-29-2001 TG changed nand_chip structure to support
* hardwarespecific function for accessing control lines
* 02-21-2002 TG added support for different read/write adress and
* ready/busy line access function
* 02-26-2002 TG added chip_delay to nand_chip structure to optimize
* command delay times for different chips
* 04-28-2002 TG OOB config defines moved from nand.c to avoid duplicate
* defines in jffs2/wbuf.c
* 08-07-2002 TG forced bad block location to byte 5 of OOB, even if
* CONFIG_MTD_NAND_ECC_JFFS2 is not set
* 08-10-2002 TG extensions to nand_chip structure to support HW-ECC
*
* 08-29-2002 tglx nand_chip structure: data_poi for selecting
* internal / fs-driver buffer
* support for 6byte/512byte hardware ECC
* read_ecc, write_ecc extended for different oob-layout
* oob layout selections: NAND_NONE_OOB, NAND_JFFS2_OOB,
* NAND_YAFFS_OOB
* 11-25-2002 tglx Added Manufacturer code FUJITSU, NATIONAL
* Split manufacturer and device ID structures
*
* 02-08-2004 tglx added option field to nand structure for chip anomalities
* 05-25-2004 tglx added bad block table support, ST-MICRO manufacturer id
* update of nand_chip structure description
* 01-17-2005 dmarlin added extended commands for AG-AND device and added option
* for BBT_AUTO_REFRESH.
* 01-20-2005 dmarlin added optional pointer to hardware specific callback for
* extra error status checks.
*/ */
#ifndef __LINUX_MTD_NAND_H #ifndef __LINUX_MTD_NAND_H
#define __LINUX_MTD_NAND_H #define __LINUX_MTD_NAND_H
...@@ -68,7 +32,8 @@ extern int nand_scan (struct mtd_info *mtd, int max_chips); ...@@ -68,7 +32,8 @@ extern int nand_scan (struct mtd_info *mtd, int max_chips);
extern void nand_release (struct mtd_info *mtd); extern void nand_release (struct mtd_info *mtd);
/* Read raw data from the device without ECC */ /* Read raw data from the device without ECC */
extern int nand_read_raw (struct mtd_info *mtd, uint8_t *buf, loff_t from, size_t len, size_t ooblen); extern int nand_read_raw (struct mtd_info *mtd, uint8_t *buf, loff_t from,
size_t len, size_t ooblen);
/* The maximum number of NAND chips in an array */ /* The maximum number of NAND chips in an array */
...@@ -84,7 +49,7 @@ extern int nand_read_raw (struct mtd_info *mtd, uint8_t *buf, loff_t from, size_ ...@@ -84,7 +49,7 @@ extern int nand_read_raw (struct mtd_info *mtd, uint8_t *buf, loff_t from, size_
* Constants for hardware specific CLE/ALE/NCE function * Constants for hardware specific CLE/ALE/NCE function
*/ */
/* Select the chip by setting nCE to low */ /* Select the chip by setting nCE to low */
#define NAND_CTL_SETNCE 1 #define NAND_CTL_SETNCE 1
/* Deselect the chip by setting nCE to high */ /* Deselect the chip by setting nCE to high */
#define NAND_CTL_CLRNCE 2 #define NAND_CTL_CLRNCE 2
/* Select the command latch by setting CLE to high */ /* Select the command latch by setting CLE to high */
...@@ -285,19 +250,19 @@ struct nand_hw_control { ...@@ -285,19 +250,19 @@ struct nand_hw_control {
* is read from the chip status register * is read from the chip status register
* @cmdfunc: [REPLACEABLE] hardwarespecific function for writing commands to the chip * @cmdfunc: [REPLACEABLE] hardwarespecific function for writing commands to the chip
* @waitfunc: [REPLACEABLE] hardwarespecific function for wait on ready * @waitfunc: [REPLACEABLE] hardwarespecific function for wait on ready
* @calculate_ecc: [REPLACEABLE] function for ecc calculation or readback from ecc hardware * @calculate_ecc: [REPLACEABLE] function for ecc calculation or readback from ecc hardware
* @correct_data: [REPLACEABLE] function for ecc correction, matching to ecc generator (sw/hw) * @correct_data: [REPLACEABLE] function for ecc correction, matching to ecc generator (sw/hw)
* @enable_hwecc: [BOARDSPECIFIC] function to enable (reset) hardware ecc generator. Must only * @enable_hwecc: [BOARDSPECIFIC] function to enable (reset) hardware ecc generator. Must only
* be provided if a hardware ECC is available * be provided if a hardware ECC is available
* @erase_cmd: [INTERN] erase command write function, selectable due to AND support * @erase_cmd: [INTERN] erase command write function, selectable due to AND support
* @scan_bbt: [REPLACEABLE] function to scan bad block table * @scan_bbt: [REPLACEABLE] function to scan bad block table
* @eccmode: [BOARDSPECIFIC] mode of ecc, see defines * @eccmode: [BOARDSPECIFIC] mode of ecc, see defines
* @eccsize: [INTERN] databytes used per ecc-calculation * @eccsize: [INTERN] databytes used per ecc-calculation
* @eccbytes: [INTERN] number of ecc bytes per ecc-calculation step * @eccbytes: [INTERN] number of ecc bytes per ecc-calculation step
* @eccsteps: [INTERN] number of ecc calculation steps per page * @eccsteps: [INTERN] number of ecc calculation steps per page
* @chip_delay: [BOARDSPECIFIC] chip dependent delay for transfering data from array to read regs (tR) * @chip_delay: [BOARDSPECIFIC] chip dependent delay for transfering data from array to read regs (tR)
* @wq: [INTERN] wait queue to sleep on if a NAND operation is in progress * @wq: [INTERN] wait queue to sleep on if a NAND operation is in progress
* @state: [INTERN] the current state of the NAND device * @state: [INTERN] the current state of the NAND device
* @page_shift: [INTERN] number of address bits in a page (column address bits) * @page_shift: [INTERN] number of address bits in a page (column address bits)
* @phys_erase_shift: [INTERN] number of address bits in a physical eraseblock * @phys_erase_shift: [INTERN] number of address bits in a physical eraseblock
* @bbt_erase_shift: [INTERN] number of address bits in a bbt entry * @bbt_erase_shift: [INTERN] number of address bits in a bbt entry
...@@ -327,7 +292,7 @@ struct nand_hw_control { ...@@ -327,7 +292,7 @@ struct nand_hw_control {
struct nand_chip { struct nand_chip {
void __iomem *IO_ADDR_R; void __iomem *IO_ADDR_R;
void __iomem *IO_ADDR_W; void __iomem *IO_ADDR_W;
u_char (*read_byte)(struct mtd_info *mtd); u_char (*read_byte)(struct mtd_info *mtd);
void (*write_byte)(struct mtd_info *mtd, u_char byte); void (*write_byte)(struct mtd_info *mtd, u_char byte);
...@@ -340,12 +305,12 @@ struct nand_chip { ...@@ -340,12 +305,12 @@ struct nand_chip {
void (*select_chip)(struct mtd_info *mtd, int chip); void (*select_chip)(struct mtd_info *mtd, int chip);
int (*block_bad)(struct mtd_info *mtd, loff_t ofs, int getchip); int (*block_bad)(struct mtd_info *mtd, loff_t ofs, int getchip);
int (*block_markbad)(struct mtd_info *mtd, loff_t ofs); int (*block_markbad)(struct mtd_info *mtd, loff_t ofs);
void (*hwcontrol)(struct mtd_info *mtd, int cmd); void (*hwcontrol)(struct mtd_info *mtd, int cmd);
int (*dev_ready)(struct mtd_info *mtd); int (*dev_ready)(struct mtd_info *mtd);
void (*cmdfunc)(struct mtd_info *mtd, unsigned command, int column, int page_addr); void (*cmdfunc)(struct mtd_info *mtd, unsigned command, int column, int page_addr);
int (*waitfunc)(struct mtd_info *mtd, struct nand_chip *this, int state); int (*waitfunc)(struct mtd_info *mtd, struct nand_chip *this, int state);
int (*calculate_ecc)(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code); int (*calculate_ecc)(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code);
int (*correct_data)(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc); int (*correct_data)(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc);
void (*enable_hwecc)(struct mtd_info *mtd, int mode); void (*enable_hwecc)(struct mtd_info *mtd, int mode);
void (*erase_cmd)(struct mtd_info *mtd, int page); void (*erase_cmd)(struct mtd_info *mtd, int page);
int (*scan_bbt)(struct mtd_info *mtd); int (*scan_bbt)(struct mtd_info *mtd);
...@@ -353,14 +318,14 @@ struct nand_chip { ...@@ -353,14 +318,14 @@ struct nand_chip {
int eccsize; int eccsize;
int eccbytes; int eccbytes;
int eccsteps; int eccsteps;
int chip_delay; int chip_delay;
wait_queue_head_t wq; wait_queue_head_t wq;
nand_state_t state; nand_state_t state;
int page_shift; int page_shift;
int phys_erase_shift; int phys_erase_shift;
int bbt_erase_shift; int bbt_erase_shift;
int chip_shift; int chip_shift;
u_char *data_buf; u_char *data_buf;
u_char *oob_buf; u_char *oob_buf;
int oobdirty; int oobdirty;
u_char *data_poi; u_char *data_poi;
...@@ -389,19 +354,19 @@ struct nand_chip { ...@@ -389,19 +354,19 @@ struct nand_chip {
#define NAND_MFR_NATIONAL 0x8f #define NAND_MFR_NATIONAL 0x8f
#define NAND_MFR_RENESAS 0x07 #define NAND_MFR_RENESAS 0x07
#define NAND_MFR_STMICRO 0x20 #define NAND_MFR_STMICRO 0x20
#define NAND_MFR_HYNIX 0xad #define NAND_MFR_HYNIX 0xad
/** /**
* struct nand_flash_dev - NAND Flash Device ID Structure * struct nand_flash_dev - NAND Flash Device ID Structure
* *
* @name: Identify the device type * @name: Identify the device type
* @id: device ID code * @id: device ID code
* @pagesize: Pagesize in bytes. Either 256 or 512 or 0 * @pagesize: Pagesize in bytes. Either 256 or 512 or 0
* If the pagesize is 0, then the real pagesize * If the pagesize is 0, then the real pagesize
* and the eraseize are determined from the * and the eraseize are determined from the
* extended id bytes in the chip * extended id bytes in the chip
* @erasesize: Size of an erase block in the flash device. * @erasesize: Size of an erase block in the flash device.
* @chipsize: Total chipsize in Mega Bytes * @chipsize: Total chipsize in Mega Bytes
* @options: Bitfield to store chip relevant options * @options: Bitfield to store chip relevant options
*/ */
struct nand_flash_dev { struct nand_flash_dev {
...@@ -416,7 +381,7 @@ struct nand_flash_dev { ...@@ -416,7 +381,7 @@ struct nand_flash_dev {
/** /**
* struct nand_manufacturers - NAND Flash Manufacturer ID Structure * struct nand_manufacturers - NAND Flash Manufacturer ID Structure
* @name: Manufacturer name * @name: Manufacturer name
* @id: manufacturer ID code of device. * @id: manufacturer ID code of device.
*/ */
struct nand_manufacturers { struct nand_manufacturers {
int id; int id;
...@@ -456,7 +421,7 @@ struct nand_bbt_descr { ...@@ -456,7 +421,7 @@ struct nand_bbt_descr {
int veroffs; int veroffs;
uint8_t version[NAND_MAX_CHIPS]; uint8_t version[NAND_MAX_CHIPS];
int len; int len;
int maxblocks; int maxblocks;
int reserved_block_code; int reserved_block_code;
uint8_t *pattern; uint8_t *pattern;
}; };
...@@ -501,8 +466,8 @@ extern int nand_default_bbt (struct mtd_info *mtd); ...@@ -501,8 +466,8 @@ extern int nand_default_bbt (struct mtd_info *mtd);
extern int nand_isbad_bbt (struct mtd_info *mtd, loff_t offs, int allowbbt); extern int nand_isbad_bbt (struct mtd_info *mtd, loff_t offs, int allowbbt);
extern int nand_erase_nand (struct mtd_info *mtd, struct erase_info *instr, int allowbbt); extern int nand_erase_nand (struct mtd_info *mtd, struct erase_info *instr, int allowbbt);
extern int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len, extern int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
size_t * retlen, u_char * buf, u_char * oob_buf, size_t * retlen, u_char * buf, u_char * oob_buf,
struct nand_oobinfo *oobsel, int flags); struct nand_oobinfo *oobsel, int flags);
/* /*
* Constants for oob configuration * Constants for oob configuration
...@@ -526,7 +491,7 @@ struct platform_nand_chip { ...@@ -526,7 +491,7 @@ struct platform_nand_chip {
int chip_offset; int chip_offset;
int nr_partitions; int nr_partitions;
struct mtd_partition *partitions; struct mtd_partition *partitions;
int chip_delay; int chip_delay;
unsigned int options; unsigned int options;
void *priv; void *priv;
}; };
...@@ -542,8 +507,8 @@ struct platform_nand_chip { ...@@ -542,8 +507,8 @@ struct platform_nand_chip {
* All fields are optional and depend on the hardware driver requirements * All fields are optional and depend on the hardware driver requirements
*/ */
struct platform_nand_ctrl { struct platform_nand_ctrl {
void (*hwcontrol)(struct mtd_info *mtd, int cmd); void (*hwcontrol)(struct mtd_info *mtd, int cmd);
int (*dev_ready)(struct mtd_info *mtd); int (*dev_ready)(struct mtd_info *mtd);
void (*select_chip)(struct mtd_info *mtd, int chip); void (*select_chip)(struct mtd_info *mtd, int chip);
void *priv; void *priv;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment