diff options
author | Marek Szyprowski <[m.szyprowski@samsung.com]> | 2010-06-10 07:47:14 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-05 05:30:59 -0400 |
commit | 8454390155aa0a23467fcfd2fdf38445f2ab86db (patch) | |
tree | c95d84678fb68ab51f1b282245ec0b0c8cf7503e /arch/arm/mach-s5pv210 | |
parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) |
ARM: S5PV210: Add more GPIO banks to gpiolib
This patch adds support for MP04 and MP05 gpio banks.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
[kgene.kim@samsung.com: minor title fix]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r-- | arch/arm/mach-s5pv210/gpiolib.c | 14 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/include/mach/gpio.h | 12 |
2 files changed, 23 insertions, 3 deletions
diff --git a/arch/arm/mach-s5pv210/gpiolib.c b/arch/arm/mach-s5pv210/gpiolib.c index 9ea8972e023d..0d459112d039 100644 --- a/arch/arm/mach-s5pv210/gpiolib.c +++ b/arch/arm/mach-s5pv210/gpiolib.c | |||
@@ -207,6 +207,20 @@ static struct s3c_gpio_chip s5pv210_gpio_4bit[] = { | |||
207 | .label = "MP03", | 207 | .label = "MP03", |
208 | }, | 208 | }, |
209 | }, { | 209 | }, { |
210 | .config = &gpio_cfg_noint, | ||
211 | .chip = { | ||
212 | .base = S5PV210_MP04(0), | ||
213 | .ngpio = S5PV210_GPIO_MP04_NR, | ||
214 | .label = "MP04", | ||
215 | }, | ||
216 | }, { | ||
217 | .config = &gpio_cfg_noint, | ||
218 | .chip = { | ||
219 | .base = S5PV210_MP05(0), | ||
220 | .ngpio = S5PV210_GPIO_MP05_NR, | ||
221 | .label = "MP05", | ||
222 | }, | ||
223 | }, { | ||
210 | .base = (S5P_VA_GPIO + 0xC00), | 224 | .base = (S5P_VA_GPIO + 0xC00), |
211 | .config = &gpio_cfg_noint, | 225 | .config = &gpio_cfg_noint, |
212 | .chip = { | 226 | .chip = { |
diff --git a/arch/arm/mach-s5pv210/include/mach/gpio.h b/arch/arm/mach-s5pv210/include/mach/gpio.h index d6461ba2b71d..1f4b595534c2 100644 --- a/arch/arm/mach-s5pv210/include/mach/gpio.h +++ b/arch/arm/mach-s5pv210/include/mach/gpio.h | |||
@@ -52,6 +52,8 @@ | |||
52 | #define S5PV210_GPIO_MP01_NR (8) | 52 | #define S5PV210_GPIO_MP01_NR (8) |
53 | #define S5PV210_GPIO_MP02_NR (4) | 53 | #define S5PV210_GPIO_MP02_NR (4) |
54 | #define S5PV210_GPIO_MP03_NR (8) | 54 | #define S5PV210_GPIO_MP03_NR (8) |
55 | #define S5PV210_GPIO_MP04_NR (8) | ||
56 | #define S5PV210_GPIO_MP05_NR (8) | ||
55 | 57 | ||
56 | /* GPIO bank numbers */ | 58 | /* GPIO bank numbers */ |
57 | 59 | ||
@@ -94,6 +96,8 @@ enum s5p_gpio_number { | |||
94 | S5PV210_GPIO_MP01_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_J4), | 96 | S5PV210_GPIO_MP01_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_J4), |
95 | S5PV210_GPIO_MP02_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP01), | 97 | S5PV210_GPIO_MP02_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP01), |
96 | S5PV210_GPIO_MP03_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP02), | 98 | S5PV210_GPIO_MP03_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP02), |
99 | S5PV210_GPIO_MP04_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP03), | ||
100 | S5PV210_GPIO_MP05_START = S5PV210_GPIO_NEXT(S5PV210_GPIO_MP04), | ||
97 | }; | 101 | }; |
98 | 102 | ||
99 | /* S5PV210 GPIO number definitions */ | 103 | /* S5PV210 GPIO number definitions */ |
@@ -127,13 +131,15 @@ enum s5p_gpio_number { | |||
127 | #define S5PV210_MP01(_nr) (S5PV210_GPIO_MP01_START + (_nr)) | 131 | #define S5PV210_MP01(_nr) (S5PV210_GPIO_MP01_START + (_nr)) |
128 | #define S5PV210_MP02(_nr) (S5PV210_GPIO_MP02_START + (_nr)) | 132 | #define S5PV210_MP02(_nr) (S5PV210_GPIO_MP02_START + (_nr)) |
129 | #define S5PV210_MP03(_nr) (S5PV210_GPIO_MP03_START + (_nr)) | 133 | #define S5PV210_MP03(_nr) (S5PV210_GPIO_MP03_START + (_nr)) |
134 | #define S5PV210_MP04(_nr) (S5PV210_GPIO_MP04_START + (_nr)) | ||
135 | #define S5PV210_MP05(_nr) (S5PV210_GPIO_MP05_START + (_nr)) | ||
130 | 136 | ||
131 | /* the end of the S5PV210 specific gpios */ | 137 | /* the end of the S5PV210 specific gpios */ |
132 | #define S5PV210_GPIO_END (S5PV210_MP03(S5PV210_GPIO_MP03_NR) + 1) | 138 | #define S5PV210_GPIO_END (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + 1) |
133 | #define S3C_GPIO_END S5PV210_GPIO_END | 139 | #define S3C_GPIO_END S5PV210_GPIO_END |
134 | 140 | ||
135 | /* define the number of gpios we need to the one after the MP03() range */ | 141 | /* define the number of gpios we need to the one after the MP05() range */ |
136 | #define ARCH_NR_GPIOS (S5PV210_MP03(S5PV210_GPIO_MP03_NR) + \ | 142 | #define ARCH_NR_GPIOS (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + \ |
137 | CONFIG_SAMSUNG_GPIO_EXTRA + 1) | 143 | CONFIG_SAMSUNG_GPIO_EXTRA + 1) |
138 | 144 | ||
139 | #include <asm-generic/gpio.h> | 145 | #include <asm-generic/gpio.h> |