diff options
author | Haojian Zhuang <haojian.zhuang@linaro.org> | 2013-03-27 19:34:19 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-04-03 07:48:33 -0400 |
commit | 2afe8229687ec24cbc07e78449a588bb8b68f858 (patch) | |
tree | 93807db897c3861622b803bfac32dcf335a2803a | |
parent | a36571b59e216e95860744c94e52ccbbe43401f0 (diff) |
pinctrl: core: add dependence of GPIOLIB
In file included from drivers/pinctrl/core.c:30:0:
include/asm-generic/gpio.h: In function 'gpio_get_value_cansleep':
include/asm-generic/gpio.h:270:2: error: implicit declaration of
function '__gpio_get_value' [-Werror=implicit-function-declaration]
include/asm-generic/gpio.h: In function 'gpio_set_value_cansleep':
include/asm-generic/gpio.h:276:2: error: implicit declaration of
function '__gpio_set_value' [-Werror=implicit-function-declaration]
drivers/pinctrl/core.c: In function 'pinctrl_ready_for_gpio_range':
drivers/pinctrl/core.c:297:9: error: implicit declaration of function
'gpio_to_chip' [-Werror=implicit-function-declaration]
drivers/pinctrl/core.c:297:27: warning: initialization makes pointer
from integer without a cast [enabled by default]
drivers/pinctrl/core.c:304:45: error: dereferencing pointer to
incomplete type
drivers/pinctrl/core.c:305:26: error: dereferencing pointer to
incomplete type
drivers/pinctrl/core.c:305:39: error: dereferencing pointer to
incomplete type
cc1: some warnings being treated as errors
make[2]: *** [drivers/pinctrl/core.o] Error 1
make[1]: *** [drivers/pinctrl] Error 2
make[1]: *** Waiting for unfinished jobs....
It's caused by CONFIG_GPIOLIB isn't enabled for some platform. So
add the dependence on pinctrl_ready_for_gpio_range().
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/pinctrl/core.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c index 3e969813154f..bcec05b5c67e 100644 --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c | |||
@@ -27,7 +27,11 @@ | |||
27 | #include <linux/pinctrl/consumer.h> | 27 | #include <linux/pinctrl/consumer.h> |
28 | #include <linux/pinctrl/pinctrl.h> | 28 | #include <linux/pinctrl/pinctrl.h> |
29 | #include <linux/pinctrl/machine.h> | 29 | #include <linux/pinctrl/machine.h> |
30 | |||
31 | #ifdef CONFIG_GPIOLIB | ||
30 | #include <asm-generic/gpio.h> | 32 | #include <asm-generic/gpio.h> |
33 | #endif | ||
34 | |||
31 | #include "core.h" | 35 | #include "core.h" |
32 | #include "devicetree.h" | 36 | #include "devicetree.h" |
33 | #include "pinmux.h" | 37 | #include "pinmux.h" |
@@ -290,6 +294,7 @@ pinctrl_match_gpio_range(struct pinctrl_dev *pctldev, unsigned gpio) | |||
290 | * certain GPIO pin doesn't have back-end pinctrl device. If the return value | 294 | * certain GPIO pin doesn't have back-end pinctrl device. If the return value |
291 | * is false, it means that pinctrl device may not be ready. | 295 | * is false, it means that pinctrl device may not be ready. |
292 | */ | 296 | */ |
297 | #ifdef CONFIG_GPIOLIB | ||
293 | static bool pinctrl_ready_for_gpio_range(unsigned gpio) | 298 | static bool pinctrl_ready_for_gpio_range(unsigned gpio) |
294 | { | 299 | { |
295 | struct pinctrl_dev *pctldev; | 300 | struct pinctrl_dev *pctldev; |
@@ -309,6 +314,9 @@ static bool pinctrl_ready_for_gpio_range(unsigned gpio) | |||
309 | } | 314 | } |
310 | return false; | 315 | return false; |
311 | } | 316 | } |
317 | #else | ||
318 | static bool pinctrl_ready_for_gpio_range(unsigned gpio) { return true; } | ||
319 | #endif | ||
312 | 320 | ||
313 | /** | 321 | /** |
314 | * pinctrl_get_device_gpio_range() - find device for GPIO range | 322 | * pinctrl_get_device_gpio_range() - find device for GPIO range |