diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-04-30 06:48:02 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-09 22:44:46 -0400 |
commit | eb90de4a2d2880f0037d2b2ba85a3e857a898b40 (patch) | |
tree | eb929b218a7ca5b7c73a55529dba8bf1d746edf8 | |
parent | e12ef7f02ed56af4f84a5743fa268901c52729bf (diff) |
ARM: S3C2413: Update GPIO pull-up support
Ensure the right get/set pull code is selected and assigned to the GPIO
core.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | arch/arm/mach-s3c2416/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c2416/s3c2416.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2416/Kconfig b/arch/arm/mach-s3c2416/Kconfig index a1308d45b94f..6d077b24d190 100644 --- a/arch/arm/mach-s3c2416/Kconfig +++ b/arch/arm/mach-s3c2416/Kconfig | |||
@@ -10,6 +10,7 @@ config CPU_S3C2416 | |||
10 | select CPU_ARM926T | 10 | select CPU_ARM926T |
11 | select S3C2416_DMA if S3C2410_DMA | 11 | select S3C2416_DMA if S3C2410_DMA |
12 | select CPU_LLSERIAL_S3C2440 | 12 | select CPU_LLSERIAL_S3C2440 |
13 | select S3C_GPIO_PULL_UPDOWN | ||
13 | select SAMSUNG_CLKSRC | 14 | select SAMSUNG_CLKSRC |
14 | select S3C2443_CLOCK | 15 | select S3C2443_CLOCK |
15 | help | 16 | help |
diff --git a/arch/arm/mach-s3c2416/s3c2416.c b/arch/arm/mach-s3c2416/s3c2416.c index ad5a63a40d6e..3bff05745d0b 100644 --- a/arch/arm/mach-s3c2416/s3c2416.c +++ b/arch/arm/mach-s3c2416/s3c2416.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include <linux/list.h> | 28 | #include <linux/list.h> |
29 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
31 | #include <linux/gpio.h> | ||
31 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
32 | #include <linux/serial_core.h> | 33 | #include <linux/serial_core.h> |
33 | #include <linux/sysdev.h> | 34 | #include <linux/sysdev.h> |
@@ -46,6 +47,9 @@ | |||
46 | #include <mach/idle.h> | 47 | #include <mach/idle.h> |
47 | #include <mach/regs-s3c2443-clock.h> | 48 | #include <mach/regs-s3c2443-clock.h> |
48 | 49 | ||
50 | #include <plat/gpio-core.h> | ||
51 | #include <plat/gpio-cfg.h> | ||
52 | #include <plat/gpio-cfg-helpers.h> | ||
49 | #include <plat/s3c2416.h> | 53 | #include <plat/s3c2416.h> |
50 | #include <plat/devs.h> | 54 | #include <plat/devs.h> |
51 | #include <plat/cpu.h> | 55 | #include <plat/cpu.h> |
@@ -104,6 +108,9 @@ void __init s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no) | |||
104 | 108 | ||
105 | void __init s3c2416_map_io(void) | 109 | void __init s3c2416_map_io(void) |
106 | { | 110 | { |
111 | s3c24xx_gpiocfg_default.set_pull = s3c_gpio_setpull_updown; | ||
112 | s3c24xx_gpiocfg_default.get_pull = s3c_gpio_getpull_updown; | ||
113 | |||
107 | iotable_init(s3c2416_iodesc, ARRAY_SIZE(s3c2416_iodesc)); | 114 | iotable_init(s3c2416_iodesc, ARRAY_SIZE(s3c2416_iodesc)); |
108 | } | 115 | } |
109 | 116 | ||