diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2008-10-16 01:03:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:40 -0400 |
commit | 93a22f8b95756c53e80308820892119c910d2739 (patch) | |
tree | 01539a24fc517e84e35c951699fc0939336b55a6 /drivers/mtd | |
parent | 0f6d504e73b49374c6093efe6aa60ab55058248a (diff) |
omap drivers: switch to standard GPIO calls
This updates most of the OMAP drivers which are in mainline to switch to
using the cross-platform GPIO calls instead of the older OMAP-specific
ones.
This is all fairly brainless/obvious stuff. Probably the most interesting
bit is to observe that the omap-keypad code seems to now have a portable
core that could work with non-OMAP matrix keypads. (That would improve
with hardware IRQ debouncing enabled, of course...)
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Antonino Daplas <adaplas@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/nand/ams-delta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c index 26d42987971f..782994ead0e8 100644 --- a/drivers/mtd/nand/ams-delta.c +++ b/drivers/mtd/nand/ams-delta.c | |||
@@ -145,7 +145,7 @@ static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd, | |||
145 | 145 | ||
146 | static int ams_delta_nand_ready(struct mtd_info *mtd) | 146 | static int ams_delta_nand_ready(struct mtd_info *mtd) |
147 | { | 147 | { |
148 | return omap_get_gpio_datain(AMS_DELTA_GPIO_PIN_NAND_RB); | 148 | return gpio_get_value(AMS_DELTA_GPIO_PIN_NAND_RB); |
149 | } | 149 | } |
150 | 150 | ||
151 | /* | 151 | /* |
@@ -185,7 +185,7 @@ static int __init ams_delta_init(void) | |||
185 | this->read_buf = ams_delta_read_buf; | 185 | this->read_buf = ams_delta_read_buf; |
186 | this->verify_buf = ams_delta_verify_buf; | 186 | this->verify_buf = ams_delta_verify_buf; |
187 | this->cmd_ctrl = ams_delta_hwcontrol; | 187 | this->cmd_ctrl = ams_delta_hwcontrol; |
188 | if (!omap_request_gpio(AMS_DELTA_GPIO_PIN_NAND_RB)) { | 188 | if (gpio_request(AMS_DELTA_GPIO_PIN_NAND_RB, "nand_rdy") == 0) { |
189 | this->dev_ready = ams_delta_nand_ready; | 189 | this->dev_ready = ams_delta_nand_ready; |
190 | } else { | 190 | } else { |
191 | this->dev_ready = NULL; | 191 | this->dev_ready = NULL; |