KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make gpio conformant to generic gpio spec.

Browse source 
SVN-Revision: 8911
This commit is contained in:
Eugene Konev 2007-09-21 12:37:50 +00:00
parent d725c9b25b
commit 041a03c5bd
5 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/linux/ar7/files/arch/mips/ar7/gpio.c
View file

@ -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;

3
target/linux/ar7/files/arch/mips/ar7/platform.c
View file

@ -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);

2
target/linux/ar7/files/drivers/char/ar7_gpio.c
View file

@ -73,7 +73,7 @@ static ssize_t ar7_gpio_write(struct file *file, const char __user *buf,
case 'o':
case 'O':
case '>':
gpio_direction_output(pin);
gpio_direction_output(pin, 0);
break;
default:
return -EINVAL;

2
target/linux/ar7/files/drivers/leds/leds-ar7.c
View file

@ -73,7 +73,7 @@ static int ar7_leds_probe(struct platform_device *pdev)
goto out;
ar7_gpio_enable(AR7_GPIO_BIT_STATUS_LED);
gpio_direction_output(AR7_GPIO_BIT_STATUS_LED);
gpio_direction_output(AR7_GPIO_BIT_STATUS_LED, 0);
out:
return rc;

55
target/linux/ar7/files/include/asm-mips/ar7/gpio.h
View file

@ -22,36 +22,10 @@
#define AR7_GPIO_MAX 32
extern int gpio_request(unsigned gpio, char *label);
extern int gpio_request(unsigned gpio, const char *label);
extern void gpio_free(unsigned gpio);
/* Common GPIO layer */
static inline int gpio_direction_input(unsigned gpio)
{
void __iomem *gpio_dir =
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
if (gpio >= AR7_GPIO_MAX)
return -EINVAL;
writel(readl(gpio_dir) | (1 << gpio), gpio_dir);
return 0;
}
static inline int gpio_direction_output(unsigned gpio)
{
void __iomem *gpio_dir =
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
if (gpio >= AR7_GPIO_MAX)
return -EINVAL;
writel(readl(gpio_dir) & ~(1 << gpio), gpio_dir);
return 0;
}
static inline int gpio_get_value(unsigned gpio)
{
void __iomem *gpio_in =
@ -78,6 +52,33 @@ static inline void gpio_set_value(unsigned gpio, int value)
writel(tmp, gpio_out);
}
static inline int gpio_direction_input(unsigned gpio)
{
void __iomem *gpio_dir =
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
if (gpio >= AR7_GPIO_MAX)
return -EINVAL;
writel(readl(gpio_dir) | (1 << gpio), gpio_dir);
return 0;
}
static inline int gpio_direction_output(unsigned gpio, int value)
{
void __iomem *gpio_dir =
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
if (gpio >= AR7_GPIO_MAX)
return -EINVAL;
gpio_set_value(gpio, value);
writel(readl(gpio_dir) & ~(1 << gpio), gpio_dir);
return 0;
}
static inline int gpio_to_irq(unsigned gpio)
{
return -EINVAL;