diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-04-30 19:48:02 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-10 11:44:46 +0900 |
| commit | eb90de4a2d2880f0037d2b2ba85a3e857a898b40 (patch) | |
| tree | eb929b218a7ca5b7c73a55529dba8bf1d746edf8 /arch | |
| parent | e12ef7f02ed56af4f84a5743fa268901c52729bf (diff) | |
| download | blackbird-op-linux-eb90de4a2d2880f0037d2b2ba85a3e857a898b40.tar.gz blackbird-op-linux-eb90de4a2d2880f0037d2b2ba85a3e857a898b40.zip | |
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>
Diffstat (limited to 'arch')
| -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 select CPU_ARM926T select S3C2416_DMA if S3C2410_DMA select CPU_LLSERIAL_S3C2440 + select S3C_GPIO_PULL_UPDOWN select SAMSUNG_CLKSRC select S3C2443_CLOCK 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 @@ #include <linux/list.h> #include <linux/timer.h> #include <linux/init.h> +#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/serial_core.h> #include <linux/sysdev.h> @@ -46,6 +47,9 @@ #include <mach/idle.h> #include <mach/regs-s3c2443-clock.h> +#include <plat/gpio-core.h> +#include <plat/gpio-cfg.h> +#include <plat/gpio-cfg-helpers.h> #include <plat/s3c2416.h> #include <plat/devs.h> #include <plat/cpu.h> @@ -104,6 +108,9 @@ void __init s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no) void __init s3c2416_map_io(void) { + s3c24xx_gpiocfg_default.set_pull = s3c_gpio_setpull_updown; + s3c24xx_gpiocfg_default.get_pull = s3c_gpio_getpull_updown; + iotable_init(s3c2416_iodesc, ARRAY_SIZE(s3c2416_iodesc)); } |
