mtd: gpio-nand: Ability to use driver for configurations without RDY-pin

In some configurations of "gpio-nand" RDY-pin may be not connected.
This patch allow to use driver for these configurations. In this case
we are assume that device always ready.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
index bc73bc5f2713695ff0edadc5d6278bf90fa8dce2..0b3c815ef80cbe9fbf77b727c44f81dd66a68aa2 100644 (file)
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/gpio.c
@@ -134,7 +134,11 @@ static void gpio_nand_readbuf16(struct mtd_info *mtd, u_char *buf, int len)
 static int gpio_nand_devready(struct mtd_info *mtd)
 {
        struct gpiomtd *gpiomtd = gpio_nand_getpriv(mtd);
-       return gpio_get_value(gpiomtd->plat.gpio_rdy);
+
+       if (gpio_is_valid(gpiomtd->plat.gpio_rdy))
+               return gpio_get_value(gpiomtd->plat.gpio_rdy);
+
+       return 1;
 }
 
 #ifdef CONFIG_OF
@@ -252,7 +256,8 @@ static int __devexit gpio_nand_remove(struct platform_device *dev)
        gpio_free(gpiomtd->plat.gpio_nce);
        if (gpio_is_valid(gpiomtd->plat.gpio_nwp))
                gpio_free(gpiomtd->plat.gpio_nwp);
-       gpio_free(gpiomtd->plat.gpio_rdy);
+       if (gpio_is_valid(gpiomtd->plat.gpio_rdy))
+               gpio_free(gpiomtd->plat.gpio_rdy);
 
        kfree(gpiomtd);
 
@@ -336,10 +341,12 @@ static int __devinit gpio_nand_probe(struct platform_device *dev)
        if (ret)
                goto err_cle;
        gpio_direction_output(gpiomtd->plat.gpio_cle, 0);
-       ret = gpio_request(gpiomtd->plat.gpio_rdy, "NAND RDY");
-       if (ret)
-               goto err_rdy;
-       gpio_direction_input(gpiomtd->plat.gpio_rdy);
+       if (gpio_is_valid(gpiomtd->plat.gpio_rdy)) {
+               ret = gpio_request(gpiomtd->plat.gpio_rdy, "NAND RDY");
+               if (ret)
+                       goto err_rdy;
+               gpio_direction_input(gpiomtd->plat.gpio_rdy);
+       }
 
 
        this->IO_ADDR_W  = this->IO_ADDR_R;
@@ -386,7 +393,8 @@ static int __devinit gpio_nand_probe(struct platform_device *dev)
 err_wp:
        if (gpio_is_valid(gpiomtd->plat.gpio_nwp))
                gpio_set_value(gpiomtd->plat.gpio_nwp, 0);
-       gpio_free(gpiomtd->plat.gpio_rdy);
+       if (gpio_is_valid(gpiomtd->plat.gpio_rdy))
+               gpio_free(gpiomtd->plat.gpio_rdy);
 err_rdy:
        gpio_free(gpiomtd->plat.gpio_cle);
 err_cle: