projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
mips
/
include
/
asm
/
mach-bcm47xx
/
gpio.h
diff --git
a/arch/mips/include/asm/mach-bcm47xx/gpio.h
b/arch/mips/include/asm/mach-bcm47xx/gpio.h
index 76961cabeedfe1cdac4caaef7e9989ca04a345be..2ef17e8df40346f07aea6e01431186686214a1f7 100644
(file)
--- a/
arch/mips/include/asm/mach-bcm47xx/gpio.h
+++ b/
arch/mips/include/asm/mach-bcm47xx/gpio.h
@@
-36,6
+36,8
@@
static inline int gpio_get_value(unsigned gpio)
return -EINVAL;
}
return -EINVAL;
}
+#define gpio_get_value_cansleep gpio_get_value
+
static inline void gpio_set_value(unsigned gpio, int value)
{
switch (bcm47xx_bus_type) {
static inline void gpio_set_value(unsigned gpio, int value)
{
switch (bcm47xx_bus_type) {
@@
-54,6
+56,19
@@
static inline void gpio_set_value(unsigned gpio, int value)
}
}
}
}
+#define gpio_set_value_cansleep gpio_set_value
+
+static inline int gpio_cansleep(unsigned gpio)
+{
+ return 0;
+}
+
+static inline int gpio_is_valid(unsigned gpio)
+{
+ return gpio < (BCM47XX_EXTIF_GPIO_LINES + BCM47XX_CHIPCO_GPIO_LINES);
+}
+
+
static inline int gpio_direction_input(unsigned gpio)
{
switch (bcm47xx_bus_type) {
static inline int gpio_direction_input(unsigned gpio)
{
switch (bcm47xx_bus_type) {
@@
-137,7
+152,4
@@
static inline int gpio_polarity(unsigned gpio, int value)
}
}
-/* cansleep wrappers */
-#include <asm-generic/gpio.h>
-
#endif /* __BCM47XX_GPIO_H */
#endif /* __BCM47XX_GPIO_H */