aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-29 04:02:39 -0500
committerKukjin Kim <kgene.kim@samsung.com>2012-01-11 12:18:32 -0500
commit91b60b1d5a56e5971237f9c88de2faf168a5ceaf (patch)
treeae25128af4ed635913c27f25b571bed64c2b7604 /arch/arm
parentd7d3077a2843faa6877280a4fac8cc732f5e7dce (diff)
ARM: S3C64XX: Fix the memory mapped GPIOs on Cragganmore
Rather than letting them get allocated dynamically where we don't know where they are, and also name the data line resource as gpio-generic requires that. Without these changes the GPIOs are useless. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-s3c64xx/include/mach/crag6410.h1
-rw-r--r--arch/arm/mach-s3c64xx/mach-crag6410.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/crag6410.h b/arch/arm/mach-s3c64xx/include/mach/crag6410.h
index 5d55ab018b6b..4cb2f951f1e9 100644
--- a/arch/arm/mach-s3c64xx/include/mach/crag6410.h
+++ b/arch/arm/mach-s3c64xx/include/mach/crag6410.h
@@ -21,5 +21,6 @@
21#define CODEC_GPIO_BASE (GPIO_BOARD_START + 8) 21#define CODEC_GPIO_BASE (GPIO_BOARD_START + 8)
22#define GLENFARCLAS_PMIC_GPIO_BASE (GPIO_BOARD_START + 32) 22#define GLENFARCLAS_PMIC_GPIO_BASE (GPIO_BOARD_START + 32)
23#define BANFF_PMIC_GPIO_BASE (GPIO_BOARD_START + 64) 23#define BANFF_PMIC_GPIO_BASE (GPIO_BOARD_START + 64)
24#define MMGPIO_GPIO_BASE (GPIO_BOARD_START + 96)
24 25
25#endif 26#endif
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 2e34fe861944..6998b5b54141 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -260,6 +260,7 @@ static struct platform_device crag6410_dm9k_device = {
260 260
261static struct resource crag6410_mmgpio_resource[] = { 261static struct resource crag6410_mmgpio_resource[] = {
262 [0] = { 262 [0] = {
263 .name = "dat",
263 .start = S3C64XX_PA_XM0CSN4 + 1, 264 .start = S3C64XX_PA_XM0CSN4 + 1,
264 .end = S3C64XX_PA_XM0CSN4 + 1, 265 .end = S3C64XX_PA_XM0CSN4 + 1,
265 .flags = IORESOURCE_MEM, 266 .flags = IORESOURCE_MEM,
@@ -272,7 +273,7 @@ static struct platform_device crag6410_mmgpio = {
272 .resource = crag6410_mmgpio_resource, 273 .resource = crag6410_mmgpio_resource,
273 .num_resources = ARRAY_SIZE(crag6410_mmgpio_resource), 274 .num_resources = ARRAY_SIZE(crag6410_mmgpio_resource),
274 .dev.platform_data = &(struct bgpio_pdata) { 275 .dev.platform_data = &(struct bgpio_pdata) {
275 .base = -1, 276 .base = MMGPIO_GPIO_BASE,
276 }, 277 },
277}; 278};
278 279