projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
994e6a8
)
fix gpio on rb532 - fixes the cf driver
author
Felix Fietkau
<nbd@openwrt.org>
Sun, 20 Apr 2008 16:32:28 +0000
(16:32 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 20 Apr 2008 16:32:28 +0000
(16:32 +0000)
SVN-Revision: 10888
target/linux/rb532/files/arch/mips/rb500/gpio.c
patch
|
blob
|
history
diff --git
a/target/linux/rb532/files/arch/mips/rb500/gpio.c
b/target/linux/rb532/files/arch/mips/rb500/gpio.c
index f7c417355a2f0e8f61261cd35ce185dd9935c421..6c92a8fe5648fe760e0dbca6b39d691ffa3a4354 100644
(file)
--- a/
target/linux/rb532/files/arch/mips/rb500/gpio.c
+++ b/
target/linux/rb532/files/arch/mips/rb500/gpio.c
@@
-43,7
+43,7
@@
static volatile unsigned char *devCtl3Base;
static unsigned char latchU5State;
static volatile unsigned char *devCtl3Base;
static unsigned char latchU5State;
-static spinlock_t clu5Lock;
+static spinlock_t clu5Lock
= SPIN_LOCK_UNLOCKED
;
struct rb500_gpio_reg __iomem *rb500_gpio_reg0;
EXPORT_SYMBOL(rb500_gpio_reg0);
struct rb500_gpio_reg __iomem *rb500_gpio_reg0;
EXPORT_SYMBOL(rb500_gpio_reg0);
@@
-116,7
+116,7
@@
EXPORT_SYMBOL(rb500_gpio_set_value);
int rb500_gpio_direction_input(unsigned gpio)
{
int rb500_gpio_direction_input(unsigned gpio)
{
- writel(readl(&rb500_gpio_reg0->gpiocfg)
|
(1 << gpio), (void *)&rb500_gpio_reg0->gpiocfg);
+ writel(readl(&rb500_gpio_reg0->gpiocfg)
& ~
(1 << gpio), (void *)&rb500_gpio_reg0->gpiocfg);
return 0;
}
return 0;
}
@@
-125,7
+125,7
@@
EXPORT_SYMBOL(rb500_gpio_direction_input);
int rb500_gpio_direction_output(unsigned gpio, int value)
{
gpio_set_value(gpio, value);
int rb500_gpio_direction_output(unsigned gpio, int value)
{
gpio_set_value(gpio, value);
- writel(readl(&rb500_gpio_reg0->gpiocfg)
& ~
(1 << gpio), (void *)&rb500_gpio_reg0->gpiocfg);
+ writel(readl(&rb500_gpio_reg0->gpiocfg)
|
(1 << gpio), (void *)&rb500_gpio_reg0->gpiocfg);
return 0;
}
return 0;
}