diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2011-01-09 09:29:45 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2011-01-09 09:29:45 +0000 |
| commit | 23a61730991364ca14a9f1b12d9075f964cd160d (patch) | |
| tree | 367f1e47108e936452f0586385a17fe5c1fc452c /target/linux/ar71xx | |
| parent | 5641e8233e4d275289b39f42041776440f868dae (diff) | |
| download | upstream-23a61730991364ca14a9f1b12d9075f964cd160d.tar.gz upstream-23a61730991364ca14a9f1b12d9075f964cd160d.tar.bz2 upstream-23a61730991364ca14a9f1b12d9075f964cd160d.zip | |
ar71xx: use gpio_*_cansleep calls in the rb4xx NAND driver
SVN-Revision: 24944
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c index 185bef04df..d6c684309d 100644 --- a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c +++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c @@ -1,7 +1,7 @@ /* * NAND flash driver for the MikroTik RouterBoard 4xx series * - * Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org> + * Copyright (C) 2008-2011 Gabor Juhos <juhosg@openwrt.org> * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org> * * This file was based on the driver for Linux 2.6.22 published by @@ -71,7 +71,7 @@ static struct mtd_partition rb4xx_nand_partitions[] = { static int rb4xx_nand_dev_ready(struct mtd_info *mtd) { - return gpio_get_value(RB4XX_NAND_GPIO_READY); + return gpio_get_value_cansleep(RB4XX_NAND_GPIO_READY); } static void rb4xx_nand_write_cmd(unsigned char cmd) @@ -88,9 +88,12 @@ static void rb4xx_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) { if (ctrl & NAND_CTRL_CHANGE) { - gpio_set_value(RB4XX_NAND_GPIO_CLE, (ctrl & NAND_CLE) ? 1 : 0); - gpio_set_value(RB4XX_NAND_GPIO_ALE, (ctrl & NAND_ALE) ? 1 : 0); - gpio_set_value(RB4XX_NAND_GPIO_NCE, (ctrl & NAND_NCE) ? 0 : 1); + gpio_set_value_cansleep(RB4XX_NAND_GPIO_CLE, + (ctrl & NAND_CLE) ? 1 : 0); + gpio_set_value_cansleep(RB4XX_NAND_GPIO_ALE, + (ctrl & NAND_ALE) ? 1 : 0); + gpio_set_value_cansleep(RB4XX_NAND_GPIO_NCE, + (ctrl & NAND_NCE) ? 0 : 1); } if (cmd != NAND_CMD_NONE) |