|
@@ -105,7 +105,7 @@ DEFINE_LED_TRIGGER(nand_led_trigger);
|
|
|
static int check_offs_len(struct mtd_info *mtd,
|
|
|
loff_t ofs, uint64_t len)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
int ret = 0;
|
|
|
|
|
|
/* Start address must align on block boundary */
|
|
@@ -131,7 +131,7 @@ static int check_offs_len(struct mtd_info *mtd,
|
|
|
*/
|
|
|
static void nand_release_device(struct mtd_info *mtd)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
|
|
|
/* De-select the NAND device */
|
|
|
chip->select_chip(mtd, -1);
|
|
@@ -145,7 +145,7 @@ static void nand_release_device(struct mtd_info *mtd)
|
|
|
*/
|
|
|
uint8_t nand_read_byte(struct mtd_info *mtd)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
return readb(chip->IO_ADDR_R);
|
|
|
}
|
|
|
|
|
@@ -158,7 +158,7 @@ uint8_t nand_read_byte(struct mtd_info *mtd)
|
|
|
*/
|
|
|
static uint8_t nand_read_byte16(struct mtd_info *mtd)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
return (uint8_t) cpu_to_le16(readw(chip->IO_ADDR_R));
|
|
|
}
|
|
|
|
|
@@ -170,7 +170,7 @@ static uint8_t nand_read_byte16(struct mtd_info *mtd)
|
|
|
*/
|
|
|
static u16 nand_read_word(struct mtd_info *mtd)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
return readw(chip->IO_ADDR_R);
|
|
|
}
|
|
|
|
|
@@ -183,7 +183,7 @@ static u16 nand_read_word(struct mtd_info *mtd)
|
|
|
*/
|
|
|
static void nand_select_chip(struct mtd_info *mtd, int chipnr)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
|
|
|
switch (chipnr) {
|
|
|
case -1:
|
|
@@ -206,7 +206,7 @@ static void nand_select_chip(struct mtd_info *mtd, int chipnr)
|
|
|
*/
|
|
|
static void nand_write_byte(struct mtd_info *mtd, uint8_t byte)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
|
|
|
chip->write_buf(mtd, &byte, 1);
|
|
|
}
|
|
@@ -220,7 +220,7 @@ static void nand_write_byte(struct mtd_info *mtd, uint8_t byte)
|
|
|
*/
|
|
|
static void nand_write_byte16(struct mtd_info *mtd, uint8_t byte)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
uint16_t word = byte;
|
|
|
|
|
|
/*
|
|
@@ -287,7 +287,7 @@ static void iowrite16_rep(void *addr, void *buf, int len)
|
|
|
*/
|
|
|
void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
|
|
|
iowrite8_rep(chip->IO_ADDR_W, buf, len);
|
|
|
}
|
|
@@ -302,7 +302,7 @@ void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
|
|
|
*/
|
|
|
void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
|
|
|
ioread8_rep(chip->IO_ADDR_R, buf, len);
|
|
|
}
|
|
@@ -317,7 +317,7 @@ void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
|
|
|
*/
|
|
|
void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
u16 *p = (u16 *) buf;
|
|
|
|
|
|
iowrite16_rep(chip->IO_ADDR_W, p, len >> 1);
|
|
@@ -333,7 +333,7 @@ void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)
|
|
|
*/
|
|
|
void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
u16 *p = (u16 *) buf;
|
|
|
|
|
|
ioread16_rep(chip->IO_ADDR_R, p, len >> 1);
|
|
@@ -350,7 +350,7 @@ void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len)
|
|
|
static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
|
|
|
{
|
|
|
int page, chipnr, res = 0, i = 0;
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
u16 bad;
|
|
|
|
|
|
if (chip->bbt_options & NAND_BBT_SCANLASTPAGE)
|
|
@@ -410,7 +410,7 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
|
|
|
*/
|
|
|
static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
struct mtd_oob_ops ops;
|
|
|
uint8_t buf[2] = { 0, 0 };
|
|
|
int ret = 0, res, i = 0;
|
|
@@ -460,7 +460,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
|
|
|
*/
|
|
|
static int nand_block_markbad_lowlevel(struct mtd_info *mtd, loff_t ofs)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
int res, ret = 0;
|
|
|
|
|
|
if (!(chip->bbt_options & NAND_BBT_NO_OOB_BBM)) {
|
|
@@ -501,7 +501,7 @@ static int nand_block_markbad_lowlevel(struct mtd_info *mtd, loff_t ofs)
|
|
|
*/
|
|
|
static int nand_check_wp(struct mtd_info *mtd)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
|
|
|
/* Broken xD cards report WP despite being writable */
|
|
|
if (chip->options & NAND_BROKEN_XD)
|
|
@@ -521,7 +521,7 @@ static int nand_check_wp(struct mtd_info *mtd)
|
|
|
*/
|
|
|
static int nand_block_isreserved(struct mtd_info *mtd, loff_t ofs)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
|
|
|
if (!chip->bbt)
|
|
|
return 0;
|
|
@@ -542,7 +542,7 @@ static int nand_block_isreserved(struct mtd_info *mtd, loff_t ofs)
|
|
|
static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip,
|
|
|
int allowbbt)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
|
|
|
if (!(chip->options & NAND_SKIP_BBTSCAN) &&
|
|
|
!(chip->options & NAND_BBT_SCANNED)) {
|
|
@@ -560,7 +560,7 @@ static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip,
|
|
|
/* Wait for the ready pin, after a command. The timeout is caught later. */
|
|
|
void nand_wait_ready(struct mtd_info *mtd)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
u32 timeo = (CONFIG_SYS_HZ * 20) / 1000;
|
|
|
u32 time_start;
|
|
|
|
|
@@ -583,7 +583,7 @@ EXPORT_SYMBOL_GPL(nand_wait_ready);
|
|
|
*/
|
|
|
static void nand_wait_status_ready(struct mtd_info *mtd, unsigned long timeo)
|
|
|
{
|
|
|
- register struct nand_chip *chip = mtd->priv;
|
|
|
+ register struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
u32 time_start;
|
|
|
|
|
|
timeo = (CONFIG_SYS_HZ * timeo) / 1000;
|
|
@@ -608,7 +608,7 @@ static void nand_wait_status_ready(struct mtd_info *mtd, unsigned long timeo)
|
|
|
static void nand_command(struct mtd_info *mtd, unsigned int command,
|
|
|
int column, int page_addr)
|
|
|
{
|
|
|
- register struct nand_chip *chip = mtd->priv;
|
|
|
+ register struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
int ctrl = NAND_CTRL_CLE | NAND_CTRL_CHANGE;
|
|
|
|
|
|
/* Write out the command to the device */
|
|
@@ -711,7 +711,7 @@ static void nand_command(struct mtd_info *mtd, unsigned int command,
|
|
|
static void nand_command_lp(struct mtd_info *mtd, unsigned int command,
|
|
|
int column, int page_addr)
|
|
|
{
|
|
|
- register struct nand_chip *chip = mtd->priv;
|
|
|
+ register struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
|
|
|
/* Emulate NAND_CMD_READOOB */
|
|
|
if (command == NAND_CMD_READOOB) {
|
|
@@ -835,7 +835,7 @@ static void panic_nand_get_device(struct nand_chip *chip,
|
|
|
static int
|
|
|
nand_get_device(struct mtd_info *mtd, int new_state)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
chip->state = new_state;
|
|
|
return 0;
|
|
|
}
|
|
@@ -1332,7 +1332,7 @@ static uint8_t *nand_transfer_oob(struct nand_chip *chip, uint8_t *oob,
|
|
|
*/
|
|
|
static int nand_setup_read_retry(struct mtd_info *mtd, int retry_mode)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
|
|
|
pr_debug("setting READ RETRY mode %d\n", retry_mode);
|
|
|
|
|
@@ -1357,7 +1357,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
|
|
|
struct mtd_oob_ops *ops)
|
|
|
{
|
|
|
int chipnr, page, realpage, col, bytes, aligned, oob_required;
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
int ret = 0;
|
|
|
uint32_t readlen = ops->len;
|
|
|
uint32_t oobreadlen = ops->ooblen;
|
|
@@ -1700,7 +1700,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
|
|
|
struct mtd_oob_ops *ops)
|
|
|
{
|
|
|
int page, realpage, chipnr;
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
struct mtd_ecc_stats stats;
|
|
|
int readlen = ops->ooblen;
|
|
|
int len;
|
|
@@ -2139,7 +2139,7 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,
|
|
|
static uint8_t *nand_fill_oob(struct mtd_info *mtd, uint8_t *oob, size_t len,
|
|
|
struct mtd_oob_ops *ops)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
|
|
|
/*
|
|
|
* Initialise to all 0xFF, to avoid the possibility of left over OOB
|
|
@@ -2199,7 +2199,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
|
|
|
struct mtd_oob_ops *ops)
|
|
|
{
|
|
|
int chipnr, realpage, page, blockmask, column;
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
uint32_t writelen = ops->len;
|
|
|
|
|
|
uint32_t oobwritelen = ops->ooblen;
|
|
@@ -2328,7 +2328,7 @@ err_out:
|
|
|
static int panic_nand_write(struct mtd_info *mtd, loff_t to, size_t len,
|
|
|
size_t *retlen, const uint8_t *buf)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
struct mtd_oob_ops ops;
|
|
|
int ret;
|
|
|
|
|
@@ -2388,7 +2388,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
|
|
|
struct mtd_oob_ops *ops)
|
|
|
{
|
|
|
int chipnr, page, status, len;
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
|
|
|
pr_debug("%s: to = 0x%08x, len = %i\n",
|
|
|
__func__, (unsigned int)to, (int)ops->ooblen);
|
|
@@ -2513,7 +2513,7 @@ out:
|
|
|
*/
|
|
|
static int single_erase(struct mtd_info *mtd, int page)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
/* Send commands to erase a block */
|
|
|
chip->cmdfunc(mtd, NAND_CMD_ERASE1, -1, page);
|
|
|
chip->cmdfunc(mtd, NAND_CMD_ERASE2, -1, -1);
|
|
@@ -2545,7 +2545,7 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
|
|
|
int allowbbt)
|
|
|
{
|
|
|
int page, status, pages_per_block, ret, chipnr;
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
loff_t len;
|
|
|
|
|
|
pr_debug("%s: start = 0x%012llx, len = %llu\n",
|
|
@@ -2908,7 +2908,7 @@ ext_out:
|
|
|
|
|
|
static int nand_setup_read_retry_micron(struct mtd_info *mtd, int retry_mode)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
uint8_t feature[ONFI_SUBFEATURE_PARAM_LEN] = {retry_mode};
|
|
|
|
|
|
return chip->onfi_set_features(mtd, chip, ONFI_FEATURE_ADDR_READ_RETRY,
|
|
@@ -3616,7 +3616,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
|
|
|
struct nand_flash_dev *table)
|
|
|
{
|
|
|
int i, nand_maf_id, nand_dev_id;
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
struct nand_flash_dev *type;
|
|
|
|
|
|
/* Set the default functions */
|
|
@@ -3680,7 +3680,7 @@ EXPORT_SYMBOL(nand_scan_ident);
|
|
|
*/
|
|
|
static bool nand_ecc_strength_good(struct mtd_info *mtd)
|
|
|
{
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
struct nand_ecc_ctrl *ecc = &chip->ecc;
|
|
|
int corr, ds_corr;
|
|
|
|
|
@@ -3709,7 +3709,7 @@ static bool nand_ecc_strength_good(struct mtd_info *mtd)
|
|
|
int nand_scan_tail(struct mtd_info *mtd)
|
|
|
{
|
|
|
int i;
|
|
|
- struct nand_chip *chip = mtd->priv;
|
|
|
+ struct nand_chip *chip = mtd_to_nand(mtd);
|
|
|
struct nand_ecc_ctrl *ecc = &chip->ecc;
|
|
|
struct nand_buffers *nbuf;
|
|
|
|