Skip to content

L
linux-elphel
Commit b919c96a authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files
Options

fix

parent 2a0c0e8f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/drivers/mtd/nand/nand_base.c
View file @ b919c96a
...@@ -3731,14 +3731,12 @@ ident_done: ...@@ -3731,14 +3731,12 @@ ident_done:
if (nand_manuf_ids[maf_idx].id == *maf_id) if (nand_manuf_ids[maf_idx].id == *maf_id)
break; break;
} }
if (chip->options & NAND_BUSWIDTH_AUTO) { if (chip->options & NAND_BUSWIDTH_AUTO) {
WARN_ON(chip->options & NAND_BUSWIDTH_16); WARN_ON(chip->options & NAND_BUSWIDTH_16);
chip->options |= busw; chip->options |= busw;
nand_set_defaults(chip, busw); nand_set_defaults(chip, busw);
} else if (busw != (chip->options & NAND_BUSWIDTH_16)) { } else if (busw != (chip->options & NAND_BUSWIDTH_16)) {
if (*maf_id == NAND_MFR_MICRON)
nandchip_micron_init(mtd, *dev_id);
/* /*
* Check, if buswidth is correct. Hardware drivers should set * Check, if buswidth is correct. Hardware drivers should set
* chip correct! * chip correct!
...@@ -3775,6 +3773,8 @@ ident_done: ...@@ -3775,6 +3773,8 @@ ident_done:
if (mtd->writesize > 512 && chip->cmdfunc == nand_command) if (mtd->writesize > 512 && chip->cmdfunc == nand_command)
chip->cmdfunc = nand_command_lp; chip->cmdfunc = nand_command_lp;
if (*maf_id == NAND_MFR_MICRON) nandchip_micron_init(mtd, *dev_id);
pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n",
*maf_id, *dev_id); *maf_id, *dev_id);
......
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