diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-06-04 15:10:45 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-06-30 21:37:21 +0200 |
| commit | 2fd48f94426d25e59732a54e2a983796714729fa (patch) | |
| tree | 5fbcc5b0a0f98e07e3903d352613e958254f4900 /arch/arm/plat-samsung | |
| parent | ab275b132a79c7b08f10fa22fc3f204eb8e26d33 (diff) | |
| download | linux-2fd48f94426d25e59732a54e2a983796714729fa.tar.bz2 | |
ARM: mach-s5p: get rid of all <mach/gpio.h> headers
This renames all the local <mach/gpio.h> headers in the S5P platforms
to <mach/gpio-samsung.h> indicating a scope local to this platform,
and cuts the implicit inclusion of <mach/gpio.h> from <linux/gpio.h>
by removing the use of NEED_MACH_GPIO_H from all S5P variants.
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/gpio-core.h | 3 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/pm-gpio.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/s5p-irq-eint.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/plat-samsung/include/plat/gpio-core.h b/arch/arm/plat-samsung/include/plat/gpio-core.h index cf5aae5b0975..6ce11bfdc37e 100644 --- a/arch/arm/plat-samsung/include/plat/gpio-core.h +++ b/arch/arm/plat-samsung/include/plat/gpio-core.h @@ -14,6 +14,9 @@ #ifndef __PLAT_SAMSUNG_GPIO_CORE_H #define __PLAT_SAMSUNG_GPIO_CORE_H +/* Bring in machine-local definitions, especially S3C_GPIO_END */ +#include <mach/gpio-samsung.h> + #define GPIOCON_OFF (0x00) #define GPIODAT_OFF (0x04) diff --git a/arch/arm/plat-samsung/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c index da268813901b..adc91662f72b 100644 --- a/arch/arm/plat-samsung/pm-gpio.c +++ b/arch/arm/plat-samsung/pm-gpio.c @@ -19,9 +19,7 @@ #include <linux/io.h> #include <linux/gpio.h> -#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX) #include <mach/gpio-samsung.h> -#endif #include <plat/gpio-core.h> #include <plat/pm.h> diff --git a/arch/arm/plat-samsung/s5p-irq-eint.c b/arch/arm/plat-samsung/s5p-irq-eint.c index ebee4dc11a94..dcd8c2cbf5bb 100644 --- a/arch/arm/plat-samsung/s5p-irq-eint.c +++ b/arch/arm/plat-samsung/s5p-irq-eint.c @@ -14,7 +14,6 @@ #include <linux/irq.h> #include <linux/io.h> #include <linux/device.h> -#include <linux/gpio.h> #include <linux/irqchip/arm-vic.h> #include <linux/of.h> @@ -26,6 +25,7 @@ #include <plat/gpio-cfg.h> #include <mach/regs-gpio.h> +#include <mach/gpio-samsung.h> static inline void s5p_irq_eint_mask(struct irq_data *data) { |