diff options
author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-08 01:15:59 -0500 |
---|---|---|
committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-11-14 08:07:59 -0500 |
commit | 1a8d5fab16ed9401d99d0c463b5e57bdd744c8d3 (patch) | |
tree | 4765d57cd3c18a6a24746faec196e660cb4b0385 /arch/arm/plat-pxa | |
parent | 478e223cc39ee98f9f9f0c87cb971a2fe0ce8d12 (diff) |
ARM: pxa: rename NR_BUILTIN_GPIO
NR_BUILTIN_GPIO is both defined in arch-pxa and arch-mmp. Now replace it
with PXA_NR_BUILTIN_GPIO and MMP_NR_BUILTIN_GPIO.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Diffstat (limited to 'arch/arm/plat-pxa')
-rw-r--r-- | arch/arm/plat-pxa/include/plat/gpio.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/arch/arm/plat-pxa/include/plat/gpio.h b/arch/arm/plat-pxa/include/plat/gpio.h deleted file mode 100644 index 258f77210b02..000000000000 --- a/arch/arm/plat-pxa/include/plat/gpio.h +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | #ifndef __PLAT_GPIO_H | ||
2 | #define __PLAT_GPIO_H | ||
3 | |||
4 | #define __ARM_GPIOLIB_COMPLEX | ||
5 | |||
6 | /* The individual machine provides register offsets and NR_BUILTIN_GPIO */ | ||
7 | #include <mach/gpio-pxa.h> | ||
8 | |||
9 | static inline int gpio_get_value(unsigned gpio) | ||
10 | { | ||
11 | if (__builtin_constant_p(gpio) && (gpio < NR_BUILTIN_GPIO)) | ||
12 | return GPLR(gpio) & GPIO_bit(gpio); | ||
13 | else | ||
14 | return __gpio_get_value(gpio); | ||
15 | } | ||
16 | |||
17 | static inline void gpio_set_value(unsigned gpio, int value) | ||
18 | { | ||
19 | if (__builtin_constant_p(gpio) && (gpio < NR_BUILTIN_GPIO)) { | ||
20 | if (value) | ||
21 | GPSR(gpio) = GPIO_bit(gpio); | ||
22 | else | ||
23 | GPCR(gpio) = GPIO_bit(gpio); | ||
24 | } else | ||
25 | __gpio_set_value(gpio, value); | ||
26 | } | ||
27 | |||
28 | #define gpio_cansleep __gpio_cansleep | ||
29 | |||
30 | #endif /* __PLAT_GPIO_H */ | ||