summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-04-13 10:47:13 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-04-13 10:47:13 +0000
commita8b37809d6c1015ec2d8bb4b3794814d89ec9c96 (patch)
tree884d475392b665ebcf227c5805fd0e9d3cb3fe66
parenteeed6076b93adcb888fdad24c5d4d52e134c4622 (diff)
[atheros] fix GPIO direction setup on ar5312, and fix compiler warnings
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10811 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/atheros/files/include/asm-mips/mach-atheros/gpio.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/target/linux/atheros/files/include/asm-mips/mach-atheros/gpio.h b/target/linux/atheros/files/include/asm-mips/mach-atheros/gpio.h
index 560b8cc0d..db7347c22 100644
--- a/target/linux/atheros/files/include/asm-mips/mach-atheros/gpio.h
+++ b/target/linux/atheros/files/include/asm-mips/mach-atheros/gpio.h
@@ -26,9 +26,8 @@ static inline int gpio_direction_input(unsigned gpio) {
return -ENXIO; \
} else { \
sysRegWrite(AR531X_GPIO_CR, \
- ( sysRegRead(AR531X_GPIO_CR) & \
- ~(AR531X_GPIO_CR_M(gpio)) ) | \
- AR531X_GPIO_CR_I(gpio) ); \
+ sysRegRead(AR531X_GPIO_CR) | \
+ AR531X_GPIO_CR_I(gpio) ); \
return 0; \
} \
)
@@ -42,6 +41,7 @@ static inline int gpio_direction_input(unsigned gpio) {
return 0; \
} \
)
+ return -ENXIO;
}
/* Sets a gpio to output with value, or returns ENXIO for non-existent gpio */
@@ -54,8 +54,8 @@ static inline int gpio_direction_output(unsigned gpio, int value) {
~(1 << gpio) ) | \
((value!=0) << gpio)) ); \
sysRegWrite(AR531X_GPIO_CR, \
- sysRegRead(AR531X_GPIO_CR) | \
- AR531X_GPIO_CR_O(gpio) ); \
+ ( sysRegRead(AR531X_GPIO_CR) & \
+ ~(AR531X_GPIO_CR_M(gpio)) )); \
return 0; \
} \
)
@@ -72,12 +72,14 @@ static inline int gpio_direction_output(unsigned gpio, int value) {
return 0; \
} \
)
+ return -ENXIO;
}
/* Reads the gpio pin. Unchecked function */
static inline int gpio_get_value(unsigned gpio) {
DO_AR5312(return (sysRegRead(AR531X_GPIO_DI) & (1 << gpio));)
DO_AR5315(return (sysRegRead(AR5315_GPIO_DI) & (1 << gpio));)
+ return 0;
}
/* Writes to the gpio pin. Unchecked function */