Commit c85d32d5 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by David Woodhouse

mtd: nand-gpio: Use default dev_ready function if RDY is missing in configuration

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 283df420
...@@ -136,10 +136,7 @@ static int gpio_nand_devready(struct mtd_info *mtd) ...@@ -136,10 +136,7 @@ static int gpio_nand_devready(struct mtd_info *mtd)
{ {
struct gpiomtd *gpiomtd = gpio_nand_getpriv(mtd); struct gpiomtd *gpiomtd = gpio_nand_getpriv(mtd);
if (gpio_is_valid(gpiomtd->plat.gpio_rdy)) return gpio_get_value(gpiomtd->plat.gpio_rdy);
return gpio_get_value(gpiomtd->plat.gpio_rdy);
return 1;
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
...@@ -307,6 +304,7 @@ static int gpio_nand_probe(struct platform_device *dev) ...@@ -307,6 +304,7 @@ static int gpio_nand_probe(struct platform_device *dev)
if (ret) if (ret)
return ret; return ret;
gpio_direction_input(gpiomtd->plat.gpio_rdy); gpio_direction_input(gpiomtd->plat.gpio_rdy);
this->dev_ready = gpio_nand_devready;
} }
this->IO_ADDR_W = this->IO_ADDR_R; this->IO_ADDR_W = this->IO_ADDR_R;
...@@ -316,7 +314,6 @@ static int gpio_nand_probe(struct platform_device *dev) ...@@ -316,7 +314,6 @@ static int gpio_nand_probe(struct platform_device *dev)
/* install our routines */ /* install our routines */
this->cmd_ctrl = gpio_nand_cmd_ctrl; this->cmd_ctrl = gpio_nand_cmd_ctrl;
this->dev_ready = gpio_nand_devready;
if (this->options & NAND_BUSWIDTH_16) { if (this->options & NAND_BUSWIDTH_16) {
this->read_buf = gpio_nand_readbuf16; this->read_buf = gpio_nand_readbuf16;
......
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