aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/files/arch
diff options
context:
space:
mode:
authorEugene Konev <ejka@imfi.kspu.ru>2007-09-21 12:37:50 +0000
committerEugene Konev <ejka@imfi.kspu.ru>2007-09-21 12:37:50 +0000
commit041a03c5bdb4339f3ed2bc90268747de5b20c951 (patch)
tree9be165a8c4ae82520674a61cefae303e06c03de5 /target/linux/ar7/files/arch
parentd725c9b25be261a9cdde4b83ff00ed0744fe9c7d (diff)
downloadupstream-041a03c5bdb4339f3ed2bc90268747de5b20c951.tar.gz
upstream-041a03c5bdb4339f3ed2bc90268747de5b20c951.tar.bz2
upstream-041a03c5bdb4339f3ed2bc90268747de5b20c951.zip
make gpio conformant to generic gpio spec.
SVN-Revision: 8911
Diffstat (limited to 'target/linux/ar7/files/arch')
-rw-r--r--target/linux/ar7/files/arch/mips/ar7/gpio.c4
-rw-r--r--target/linux/ar7/files/arch/mips/ar7/platform.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/target/linux/ar7/files/arch/mips/ar7/gpio.c b/target/linux/ar7/files/arch/mips/ar7/gpio.c
index e18dfe873a..11f300fead 100644
--- a/target/linux/ar7/files/arch/mips/ar7/gpio.c
+++ b/target/linux/ar7/files/arch/mips/ar7/gpio.c
@@ -20,9 +20,9 @@
#include <asm/ar7/gpio.h>
-static char *ar7_gpio_list[AR7_GPIO_MAX] = { 0, };
+static const char *ar7_gpio_list[AR7_GPIO_MAX] = { 0, };
-int gpio_request(unsigned gpio, char *label)
+int gpio_request(unsigned gpio, const char *label)
{
if (gpio >= AR7_GPIO_MAX)
return -EINVAL;
diff --git a/target/linux/ar7/files/arch/mips/ar7/platform.c b/target/linux/ar7/files/arch/mips/ar7/platform.c
index 1af1a87b2a..980739f90a 100644
--- a/target/linux/ar7/files/arch/mips/ar7/platform.c
+++ b/target/linux/ar7/files/arch/mips/ar7/platform.c
@@ -58,10 +58,9 @@ static int vlynq_on(struct vlynq_device *dev)
if ((result = ar7_gpio_enable(pdata->gpio_bit)))
goto out_enabled;
- if ((result = gpio_direction_output(pdata->gpio_bit)))
+ if ((result = gpio_direction_output(pdata->gpio_bit, 0)))
goto out_gpio_enabled;
- gpio_set_value(pdata->gpio_bit, 0);
mdelay(50);
gpio_set_value(pdata->gpio_bit, 1);