aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s5p64x0/include/mach/gpio.h4
-rw-r--r--arch/arm/mach-s5pc100/include/mach/gpio.h3
-rw-r--r--arch/arm/mach-s5pv210/include/mach/gpio.h4
-rw-r--r--arch/arm/plat-samsung/Kconfig16
4 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/mach-s5p64x0/include/mach/gpio.h b/arch/arm/mach-s5p64x0/include/mach/gpio.h
index 06cd3c9b16ac..cbd325e14477 100644
--- a/arch/arm/mach-s5p64x0/include/mach/gpio.h
+++ b/arch/arm/mach-s5p64x0/include/mach/gpio.h
@@ -125,8 +125,4 @@ enum s5p6450_gpio_number {
125 125
126#define S3C_GPIO_END S5P64X0_GPIO_END 126#define S3C_GPIO_END S5P64X0_GPIO_END
127 127
128/* define the number of gpios we need to the one after the last GPIO range */
129
130#define ARCH_NR_GPIOS (S5P64X0_GPIO_END + CONFIG_SAMSUNG_GPIO_EXTRA)
131
132#endif /* __ASM_ARCH_GPIO_H */ 128#endif /* __ASM_ARCH_GPIO_H */
diff --git a/arch/arm/mach-s5pc100/include/mach/gpio.h b/arch/arm/mach-s5pc100/include/mach/gpio.h
index 5e1a924b595f..291c57504bab 100644
--- a/arch/arm/mach-s5pc100/include/mach/gpio.h
+++ b/arch/arm/mach-s5pc100/include/mach/gpio.h
@@ -138,7 +138,4 @@ enum s5p_gpio_number {
138/* It used the end of the S5PC100 gpios */ 138/* It used the end of the S5PC100 gpios */
139#define S3C_GPIO_END S5PC100_GPIO_END 139#define S3C_GPIO_END S5PC100_GPIO_END
140 140
141/* define the number of gpios we need to the one after the MP04() range */
142#define ARCH_NR_GPIOS (S5PC100_GPIO_END + 1)
143
144#endif /* __ASM_ARCH_GPIO_H */ 141#endif /* __ASM_ARCH_GPIO_H */
diff --git a/arch/arm/mach-s5pv210/include/mach/gpio.h b/arch/arm/mach-s5pv210/include/mach/gpio.h
index 6c8b903c02e4..e6f80d57c38e 100644
--- a/arch/arm/mach-s5pv210/include/mach/gpio.h
+++ b/arch/arm/mach-s5pv210/include/mach/gpio.h
@@ -133,8 +133,4 @@ enum s5p_gpio_number {
133#define S5PV210_GPIO_END (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + 1) 133#define S5PV210_GPIO_END (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + 1)
134#define S3C_GPIO_END S5PV210_GPIO_END 134#define S3C_GPIO_END S5PV210_GPIO_END
135 135
136/* define the number of gpios we need to the one after the MP05() range */
137#define ARCH_NR_GPIOS (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + \
138 CONFIG_SAMSUNG_GPIO_EXTRA + 1)
139
140#endif /* __ASM_ARCH_GPIO_H */ 136#endif /* __ASM_ARCH_GPIO_H */
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
108 Internal configuration to get and set correct GPIO driver strength 108 Internal configuration to get and set correct GPIO driver strength
109 helper 109 helper
110 110
111config SAMSUNG_GPIO_EXTRA
112 int "Number of additional GPIO pins"
113 default 128 if SAMSUNG_GPIO_EXTRA128
114 default 64 if SAMSUNG_GPIO_EXTRA64
115 default 0
116 help
117 Use additional GPIO space in addition to the GPIO's the SOC
118 provides. This allows expanding the GPIO space for use with
119 GPIO expanders.
120
121config SAMSUNG_GPIO_EXTRA64
122 bool
123
124config SAMSUNG_GPIO_EXTRA128
125 bool
126
127config S3C_GPIO_SPACE 111config S3C_GPIO_SPACE
128 int "Space between gpio banks" 112 int "Space between gpio banks"
129 default 0 113 default 0