Commit f6c36aaa authored by Boris Brezillon's avatar Boris Brezillon

mtd: nand: lpc32xx: rely on generic DT parsing done in nand_scan_ident()

The core now takes care of parsing generic DT properties in
nand_scan_ident() when nand_set_flash_node() has been called.
Rely on this initialization instead of calling of_get_nand_xxx()
manually.
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 2d01922c
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <linux/mtd/nand_ecc.h> #include <linux/mtd/nand_ecc.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_mtd.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#include <linux/mtd/lpc32xx_slc.h> #include <linux/mtd/lpc32xx_slc.h>
...@@ -219,7 +218,6 @@ struct lpc32xx_nand_cfg_slc { ...@@ -219,7 +218,6 @@ struct lpc32xx_nand_cfg_slc {
uint32_t rwidth; uint32_t rwidth;
uint32_t rhold; uint32_t rhold;
uint32_t rsetup; uint32_t rsetup;
bool use_bbt;
int wp_gpio; int wp_gpio;
struct mtd_partition *parts; struct mtd_partition *parts;
unsigned num_parts; unsigned num_parts;
...@@ -783,7 +781,6 @@ static struct lpc32xx_nand_cfg_slc *lpc32xx_parse_dt(struct device *dev) ...@@ -783,7 +781,6 @@ static struct lpc32xx_nand_cfg_slc *lpc32xx_parse_dt(struct device *dev)
return NULL; return NULL;
} }
ncfg->use_bbt = of_get_nand_on_flash_bbt(np);
ncfg->wp_gpio = of_get_named_gpio(np, "gpios", 0); ncfg->wp_gpio = of_get_named_gpio(np, "gpios", 0);
return ncfg; return ncfg;
...@@ -918,19 +915,15 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) ...@@ -918,19 +915,15 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
chip->ecc.bytes = LPC32XX_SLC_DEV_ECC_BYTES; chip->ecc.bytes = LPC32XX_SLC_DEV_ECC_BYTES;
chip->ecc.prepad = chip->ecc.postpad = 0; chip->ecc.prepad = chip->ecc.postpad = 0;
/* Avoid extra scan if using BBT, setup BBT support */ /*
if (host->ncfg->use_bbt) { * Use a custom BBT marker setup for small page FLASH that
chip->bbt_options |= NAND_BBT_USE_FLASH; * won't interfere with the ECC layout. Large and huge page
* FLASH use the standard layout.
/* */
* Use a custom BBT marker setup for small page FLASH that if ((chip->bbt_options & NAND_BBT_USE_FLASH) &&
* won't interfere with the ECC layout. Large and huge page mtd->writesize <= 512) {
* FLASH use the standard layout. chip->bbt_td = &bbt_smallpage_main_descr;
*/ chip->bbt_md = &bbt_smallpage_mirror_descr;
if (mtd->writesize <= 512) {
chip->bbt_td = &bbt_smallpage_main_descr;
chip->bbt_md = &bbt_smallpage_mirror_descr;
}
} }
/* /*
......
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