diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2019-11-17 18:34:25 +0100 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2019-11-17 18:34:25 +0100 |
| commit | 589e1b6c47ce72fcae103c2e45d899610c92c11e (patch) | |
| tree | 125fe159c2800ba70c7bff6b5f0f35e51efb8cdd /drivers/mtd/nand/raw/nand_micron.c | |
| parent | 8389a7b909f252e74ea92b2794de8d660cfee96e (diff) | |
| parent | 777260a5c99226cfa58325b6a7c2f39bb46f5aaf (diff) | |
Merge tag 'nand/for-5.5' into mtd/next
Raw NAND core
* Useless extra checks dropped.
* Updated the detection of the bad block markers position
Raw NAND controller drivers:
* Cadence : New driver
* Brcmnand: Support for flash-dma v0 + fixes
* Denali : Support for the legacy controller/chip DT representation
dropped
* Superfluous dev_err() calls removed
Diffstat (limited to 'drivers/mtd/nand/raw/nand_micron.c')
| -rw-r--r-- | drivers/mtd/nand/raw/nand_micron.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c index 8ca9fad6e6ad..56654030ec7f 100644 --- a/drivers/mtd/nand/raw/nand_micron.c +++ b/drivers/mtd/nand/raw/nand_micron.c @@ -446,8 +446,10 @@ static int micron_nand_init(struct nand_chip *chip) if (ret) goto err_free_manuf_data; + chip->options |= NAND_BBM_FIRSTPAGE; + if (mtd->writesize == 2048) - chip->options |= NAND_BBM_FIRSTPAGE | NAND_BBM_SECONDPAGE; + chip->options |= NAND_BBM_SECONDPAGE; ondie = micron_supports_on_die_ecc(chip); |