RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-02-02 04:42:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ar71xx: use gpio_*_cansleep calls in the rb4xx NAND driver

Browse Source 
SVN-Revision: 24944
This commit is contained in:
Gabor Juhos 2011-01-09 09:29:45 +00:00
parent 5641e8233e
commit 23a6173099
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
View File

@ -1,7 +1,7 @@
/* /*
* NAND flash driver for the MikroTik RouterBoard 4xx series * 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> * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
* *
* This file was based on the driver for Linux 2.6.22 published by * 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) 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) 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) unsigned int ctrl)
{ {
if (ctrl & NAND_CTRL_CHANGE) { if (ctrl & NAND_CTRL_CHANGE) {
gpio_set_value(RB4XX_NAND_GPIO_CLE, (ctrl & NAND_CLE) ? 1 : 0); gpio_set_value_cansleep(RB4XX_NAND_GPIO_CLE,
gpio_set_value(RB4XX_NAND_GPIO_ALE, (ctrl & NAND_ALE) ? 1 : 0); (ctrl & NAND_CLE) ? 1 : 0);
gpio_set_value(RB4XX_NAND_GPIO_NCE, (ctrl & NAND_NCE) ? 0 : 1); 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) if (cmd != NAND_CMD_NONE)