mtd: nand-gpio: Use default dev_ready function if RDY is missing in configuration
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
index c35f46e..8f102d1 100644
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/gpio.c
@@ -136,10 +136,7 @@
{
struct gpiomtd *gpiomtd = gpio_nand_getpriv(mtd);
- if (gpio_is_valid(gpiomtd->plat.gpio_rdy))
- return gpio_get_value(gpiomtd->plat.gpio_rdy);
-
- return 1;
+ return gpio_get_value(gpiomtd->plat.gpio_rdy);
}
#ifdef CONFIG_OF
@@ -307,6 +304,7 @@
if (ret)
return ret;
gpio_direction_input(gpiomtd->plat.gpio_rdy);
+ this->dev_ready = gpio_nand_devready;
}
this->IO_ADDR_W = this->IO_ADDR_R;
@@ -316,7 +314,6 @@
/* install our routines */
this->cmd_ctrl = gpio_nand_cmd_ctrl;
- this->dev_ready = gpio_nand_devready;
if (this->options & NAND_BUSWIDTH_16) {
this->read_buf = gpio_nand_readbuf16;