projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mtd: nand: Wait for PAGEPROG to finish in drivers setting NAND_ECC_CUSTOM_PAGE_ACCESS
[oweals/u-boot.git]
/
drivers
/
mtd
/
nand
/
mxs_nand_spl.c
diff --git
a/drivers/mtd/nand/mxs_nand_spl.c
b/drivers/mtd/nand/mxs_nand_spl.c
index 0b3a604cf98c7dbea6da4ee64628678d9ed24f98..b6c9208140fbe9dd62b5a1083d0cc6e0a957248e 100644
(file)
--- a/
drivers/mtd/nand/mxs_nand_spl.c
+++ b/
drivers/mtd/nand/mxs_nand_spl.c
@@
-14,7
+14,7
@@
static struct nand_chip nand_chip;
static void mxs_nand_command(struct mtd_info *mtd, unsigned int command,
int column, int page_addr)
{
static void mxs_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)
;
u32 timeo, time_start;
/* write out the command to the device */
u32 timeo, time_start;
/* write out the command to the device */
@@
-51,7
+51,7
@@
static void mxs_nand_command(struct mtd_info *mtd, unsigned int command,
static int mxs_flash_ident(struct mtd_info *mtd)
{
static int mxs_flash_ident(struct mtd_info *mtd)
{
- register struct nand_chip *chip = mtd
->priv
;
+ register struct nand_chip *chip = mtd
_to_nand(mtd)
;
int i;
u8 mfg_id, dev_id;
u8 id_data[8];
int i;
u8 mfg_id, dev_id;
u8 id_data[8];
@@
-111,7
+111,7
@@
static int mxs_flash_ident(struct mtd_info *mtd)
static int mxs_read_page_ecc(struct mtd_info *mtd, void *buf, unsigned int page)
{
static int mxs_read_page_ecc(struct mtd_info *mtd, void *buf, unsigned int page)
{
- register struct nand_chip *chip = mtd
->priv
;
+ register struct nand_chip *chip = mtd
_to_nand(mtd)
;
int ret;
chip->cmdfunc(mtd, NAND_CMD_READ0, 0x0, page);
int ret;
chip->cmdfunc(mtd, NAND_CMD_READ0, 0x0, page);
@@
-125,7
+125,7
@@
static int mxs_read_page_ecc(struct mtd_info *mtd, void *buf, unsigned int page)
static int is_badblock(struct mtd_info *mtd, loff_t offs, int allowbbt)
{
static int is_badblock(struct mtd_info *mtd, loff_t offs, int allowbbt)
{
- register struct nand_chip *chip = mtd
->priv
;
+ register struct nand_chip *chip = mtd
_to_nand(mtd)
;
unsigned int block = offs >> chip->phys_erase_shift;
unsigned int page = offs >> chip->page_shift;
unsigned int block = offs >> chip->phys_erase_shift;
unsigned int page = offs >> chip->page_shift;
@@
-147,14
+147,13
@@
static int mxs_nand_init(void)
/* init mxs nand driver */
board_nand_init(&nand_chip);
/* init mxs nand driver */
board_nand_init(&nand_chip);
- mtd = &nand_chip.mtd;
- mtd->priv = &nand_chip;
+ mtd = nand_to_mtd(&nand_chip);
/* set mtd functions */
nand_chip.cmdfunc = mxs_nand_command;
nand_chip.numchips = 1;
/* identify flash device */
/* set mtd functions */
nand_chip.cmdfunc = mxs_nand_command;
nand_chip.numchips = 1;
/* identify flash device */
- puts("
NAND
: ");
+ puts(": ");
if (mxs_flash_ident(mtd)) {
printf("Failed to identify\n");
return -1;
if (mxs_flash_ident(mtd)) {
printf("Failed to identify\n");
return -1;
@@
-181,7
+180,7
@@
int nand_spl_load_image(uint32_t offs, unsigned int size, void *buf)
if (mxs_nand_init())
return -ENODEV;
if (mxs_nand_init())
return -ENODEV;
- chip = mtd
->priv
;
+ chip = mtd
_to_nand(mtd)
;
page = offs >> chip->page_shift;
nand_page_per_block = mtd->erasesize / mtd->writesize;
page = offs >> chip->page_shift;
nand_page_per_block = mtd->erasesize / mtd->writesize;