aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHåvard Skinnemoen <haavard.skinnemoen@atmel.com>2008-06-06 12:04:51 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2008-06-07 03:42:38 -0400
commit62fd71fe710886ba449e932ad7877f4a8340c2d4 (patch)
treec1038cc0c1e8a7fe497ece15ef85ffae3f32971c
parentaa83570e23e626fe8dd1253f17e6d175507025f1 (diff)
[MTD] [NAND] at91_nand: Convert to generic GPIO API
No point in using an AT91-specific GPIO API when the generic API works just as well. Signed-off-by: Håvard Skinnemoen <haavard.skinnemoen@atmel.com> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r--drivers/mtd/nand/at91_nand.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/mtd/nand/at91_nand.c b/drivers/mtd/nand/at91_nand.c
index 0adb287027a2..2dcaeeae2068 100644
--- a/drivers/mtd/nand/at91_nand.c
+++ b/drivers/mtd/nand/at91_nand.c
@@ -31,12 +31,10 @@
31#include <linux/mtd/nand.h> 31#include <linux/mtd/nand.h>
32#include <linux/mtd/partitions.h> 32#include <linux/mtd/partitions.h>
33 33
34#include <asm/gpio.h>
34#include <asm/io.h> 35#include <asm/io.h>
35#include <asm/sizes.h>
36 36
37#include <asm/hardware.h>
38#include <asm/arch/board.h> 37#include <asm/arch/board.h>
39#include <asm/arch/gpio.h>
40 38
41#ifdef CONFIG_MTD_NAND_AT91_ECC_HW 39#ifdef CONFIG_MTD_NAND_AT91_ECC_HW
42#define hard_ecc 1 40#define hard_ecc 1
@@ -99,7 +97,7 @@ struct at91_nand_host {
99static void at91_nand_enable(struct at91_nand_host *host) 97static void at91_nand_enable(struct at91_nand_host *host)
100{ 98{
101 if (host->board->enable_pin) 99 if (host->board->enable_pin)
102 at91_set_gpio_value(host->board->enable_pin, 0); 100 gpio_set_value(host->board->enable_pin, 0);
103} 101}
104 102
105/* 103/*
@@ -108,7 +106,7 @@ static void at91_nand_enable(struct at91_nand_host *host)
108static void at91_nand_disable(struct at91_nand_host *host) 106static void at91_nand_disable(struct at91_nand_host *host)
109{ 107{
110 if (host->board->enable_pin) 108 if (host->board->enable_pin)
111 at91_set_gpio_value(host->board->enable_pin, 1); 109 gpio_set_value(host->board->enable_pin, 1);
112} 110}
113 111
114/* 112/*
@@ -142,7 +140,7 @@ static int at91_nand_device_ready(struct mtd_info *mtd)
142 struct nand_chip *nand_chip = mtd->priv; 140 struct nand_chip *nand_chip = mtd->priv;
143 struct at91_nand_host *host = nand_chip->priv; 141 struct at91_nand_host *host = nand_chip->priv;
144 142
145 return at91_get_gpio_value(host->board->rdy_pin); 143 return gpio_get_value(host->board->rdy_pin);
146} 144}
147 145
148/* 146/*
@@ -447,7 +445,7 @@ static int __init at91_nand_probe(struct platform_device *pdev)
447 at91_nand_enable(host); 445 at91_nand_enable(host);
448 446
449 if (host->board->det_pin) { 447 if (host->board->det_pin) {
450 if (at91_get_gpio_value(host->board->det_pin)) { 448 if (gpio_get_value(host->board->det_pin)) {
451 printk ("No SmartMedia card inserted.\n"); 449 printk ("No SmartMedia card inserted.\n");
452 res = ENXIO; 450 res = ENXIO;
453 goto out; 451 goto out;