From ab275b132a79c7b08f10fa22fc3f204eb8e26d33 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 3 Jun 2014 16:14:01 +0200 Subject: ARM: s5p: cut the custom ARCH_NR_GPIOS definition The number of GPIOs defined for the different S5P platforms using the tricky #define macros are actually as follows: S5P64x0: 180 GPIOs S5PC100: 115 GPIOs S5PV210: 252 GPIOs The include file will automatically bump us to 256 GPIOs which is a nice default value that happens to encompass all the S5P platform requirements under its roof. Cut ARCH_NR_GPIOS and the custom spacing macro for extra GPIOs that is not used anywhere in the kernel. Acked-by: Alexandre Courbot Signed-off-by: Linus Walleij --- arch/arm/plat-samsung/Kconfig | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'arch/arm/plat-samsung') diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 301b892d97d9..1e1811274e74 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -108,22 +108,6 @@ config S5P_GPIO_DRVSTR Internal configuration to get and set correct GPIO driver strength helper -config SAMSUNG_GPIO_EXTRA - int "Number of additional GPIO pins" - default 128 if SAMSUNG_GPIO_EXTRA128 - default 64 if SAMSUNG_GPIO_EXTRA64 - default 0 - help - Use additional GPIO space in addition to the GPIO's the SOC - provides. This allows expanding the GPIO space for use with - GPIO expanders. - -config SAMSUNG_GPIO_EXTRA64 - bool - -config SAMSUNG_GPIO_EXTRA128 - bool - config S3C_GPIO_SPACE int "Space between gpio banks" default 0 -- cgit v1.2.3 From 2fd48f94426d25e59732a54e2a983796714729fa Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 4 Jun 2014 15:10:45 +0200 Subject: ARM: mach-s5p: get rid of all headers This renames all the local headers in the S5P platforms to indicating a scope local to this platform, and cuts the implicit inclusion of from by removing the use of NEED_MACH_GPIO_H from all S5P variants. Acked-by: Alexandre Courbot Signed-off-by: Linus Walleij --- arch/arm/plat-samsung/include/plat/gpio-core.h | 3 +++ arch/arm/plat-samsung/pm-gpio.c | 2 -- arch/arm/plat-samsung/s5p-irq-eint.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'arch/arm/plat-samsung') 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 + #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 #include -#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX) #include -#endif #include #include 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 #include #include -#include #include #include @@ -26,6 +25,7 @@ #include #include +#include static inline void s5p_irq_eint_mask(struct irq_data *data) { -- cgit v1.2.3