提交 2d01922c 编写于 作者: B Boris Brezillon

mtd: nand: hisi504: 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: NBoris Brezillon <boris.brezillon@free-electrons.com>
上级 363b5db2
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_mtd.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/clk.h> #include <linux/clk.h>
...@@ -662,10 +661,9 @@ static int hisi_nfc_ecc_probe(struct hinfc_host *host) ...@@ -662,10 +661,9 @@ static int hisi_nfc_ecc_probe(struct hinfc_host *host)
struct device *dev = host->dev; struct device *dev = host->dev;
struct nand_chip *chip = &host->chip; struct nand_chip *chip = &host->chip;
struct mtd_info *mtd = nand_to_mtd(chip); struct mtd_info *mtd = nand_to_mtd(chip);
struct device_node *np = host->dev->of_node;
size = of_get_nand_ecc_step_size(np); size = chip->ecc.size;
strength = of_get_nand_ecc_strength(np); strength = chip->ecc.strength;
if (size != 1024) { if (size != 1024) {
dev_err(dev, "error ecc size: %d\n", size); dev_err(dev, "error ecc size: %d\n", size);
return -EINVAL; return -EINVAL;
...@@ -715,7 +713,7 @@ static int hisi_nfc_ecc_probe(struct hinfc_host *host) ...@@ -715,7 +713,7 @@ static int hisi_nfc_ecc_probe(struct hinfc_host *host)
static int hisi_nfc_probe(struct platform_device *pdev) static int hisi_nfc_probe(struct platform_device *pdev)
{ {
int ret = 0, irq, buswidth, flag, max_chips = HINFC504_MAX_CHIP; int ret = 0, irq, flag, max_chips = HINFC504_MAX_CHIP;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct hinfc_host *host; struct hinfc_host *host;
struct nand_chip *chip; struct nand_chip *chip;
...@@ -767,12 +765,6 @@ static int hisi_nfc_probe(struct platform_device *pdev) ...@@ -767,12 +765,6 @@ static int hisi_nfc_probe(struct platform_device *pdev)
chip->read_buf = hisi_nfc_read_buf; chip->read_buf = hisi_nfc_read_buf;
chip->chip_delay = HINFC504_CHIP_DELAY; chip->chip_delay = HINFC504_CHIP_DELAY;
chip->ecc.mode = of_get_nand_ecc_mode(np);
buswidth = of_get_nand_bus_width(np);
if (buswidth == 16)
chip->options |= NAND_BUSWIDTH_16;
hisi_nfc_host_init(host); hisi_nfc_host_init(host);
ret = devm_request_irq(dev, irq, hinfc_irq_handle, 0x0, "nandc", host); ret = devm_request_irq(dev, irq, hinfc_irq_handle, 0x0, "nandc", host);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册