Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18afbc54 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Artem Bityutskiy
Browse files

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: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 74830966

drivers/mtd/nand/gpio.c

+15 −7
Original line number Diff line number Diff line
@@ -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);



	if (gpio_is_valid(gpiomtd->plat.gpio_rdy))

		return gpio_get_value(gpiomtd->plat.gpio_rdy);



	return 1;

}



#ifdef CONFIG_OF
@@ -252,6 +256,7 @@ 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);

	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);

	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,6 +393,7 @@ 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);

	if (gpio_is_valid(gpiomtd->plat.gpio_rdy))

		gpio_free(gpiomtd->plat.gpio_rdy);

err_rdy:

	gpio_free(gpiomtd->plat.gpio_cle);