aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2009-02-14 20:22:31 +0000
committerMichael Büsch <mb@bu3sch.de>2009-02-14 20:22:31 +0000
commite996ce246c8e10b0d912f966c745d9078e6d8d47 (patch)
tree1ef429f364ee7b208a60dad4053305b1666e474b
parentdf0643a4089d4cec8c475701d8602c8dbba6237c (diff)
downloadupstream-e996ce246c8e10b0d912f966c745d9078e6d8d47.tar.gz
upstream-e996ce246c8e10b0d912f966c745d9078e6d8d47.tar.bz2
upstream-e996ce246c8e10b0d912f966c745d9078e6d8d47.zip
Fix bcm47xx GPIO dirin/dirout API return codes.
SVN-Revision: 14509
-rw-r--r--target/linux/brcm47xx/patches-2.6.28/811-bcm47xx-fix-gpio-direction-retval.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.28/811-bcm47xx-fix-gpio-direction-retval.patch b/target/linux/brcm47xx/patches-2.6.28/811-bcm47xx-fix-gpio-direction-retval.patch
new file mode 100644
index 0000000000..5c4ecfe870
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.28/811-bcm47xx-fix-gpio-direction-retval.patch
@@ -0,0 +1,49 @@
+The GPIO API is supposed to return 0 or a negative error code,
+but the SSB GPIO functions return the bitmask of the GPIO register.
+Fix this by ignoring the bitmask and always returning 0. The SSB GPIO functions can't fail.
+
+--mb
+
+
+
+Index: linux-2.6.28.5/arch/mips/include/asm/mach-bcm47xx/gpio.h
+===================================================================
+--- linux-2.6.28.5.orig/arch/mips/include/asm/mach-bcm47xx/gpio.h 2009-02-14 20:52:31.000000000 +0100
++++ linux-2.6.28.5/arch/mips/include/asm/mach-bcm47xx/gpio.h 2009-02-14 21:01:20.000000000 +0100
+@@ -31,24 +31,28 @@ static inline void gpio_set_value(unsign
+
+ static inline int gpio_direction_input(unsigned gpio)
+ {
+- return ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 0);
++ ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 0);
++ return 0;
+ }
+
+ static inline int gpio_direction_output(unsigned gpio, int value)
+ {
+- return ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 1 << gpio);
++ ssb_gpio_outen(&ssb_bcm47xx, 1 << gpio, 1 << gpio);
++ return 0;
+ }
+
+-static int gpio_intmask(unsigned gpio, int value)
++static inline int gpio_intmask(unsigned gpio, int value)
+ {
+- return ssb_gpio_intmask(&ssb_bcm47xx, 1 << gpio,
+- value ? 1 << gpio : 0);
++ ssb_gpio_intmask(&ssb_bcm47xx, 1 << gpio,
++ value ? 1 << gpio : 0);
++ return 0;
+ }
+
+-static int gpio_polarity(unsigned gpio, int value)
++static inline int gpio_polarity(unsigned gpio, int value)
+ {
+- return ssb_gpio_polarity(&ssb_bcm47xx, 1 << gpio,
+- value ? 1 << gpio : 0);
++ ssb_gpio_polarity(&ssb_bcm47xx, 1 << gpio,
++ value ? 1 << gpio : 0);
++ return 0;
+ }
+
+