summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2440/s3c2440.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-03 09:39:45 +0400
committerBen Dooks <ben-linux@fluff.org>2010-05-06 04:25:57 +0400
commit1ec7269fd8b05044f2cb4059b679e053d57460f5 (patch)
tree20addcc19fac614b2954fc1b126d9ae5ca38485e /arch/arm/mach-s3c2440/s3c2440.c
parent9bbb851c7079ff670ba3fe6c7ce93bb5daa9a694 (diff)
downloadlinux-1ec7269fd8b05044f2cb4059b679e053d57460f5.tar.xz
ARM: S3C24XX: Add the gpio pull configuration for pull-up
Add the necessary gpio configuration helper for the devices which have a single-bit pull-up resistor disabled. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2440/s3c2440.c')
-rw-r--r--arch/arm/mach-s3c2440/s3c2440.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c
index 2b68f7ea45ae..d50f3ae6173d 100644
--- a/arch/arm/mach-s3c2440/s3c2440.c
+++ b/arch/arm/mach-s3c2440/s3c2440.c
@@ -19,6 +19,7 @@
#include <linux/platform_device.h>
#include <linux/serial_core.h>
#include <linux/sysdev.h>
+#include <linux/gpio.h>
#include <linux/clk.h>
#include <linux/io.h>
@@ -33,6 +34,10 @@
#include <plat/cpu.h>
#include <plat/s3c244x.h>
+#include <plat/gpio-core.h>
+#include <plat/gpio-cfg.h>
+#include <plat/gpio-cfg-helpers.h>
+
static struct sys_device s3c2440_sysdev = {
.cls = &s3c2440_sysclass,
};
@@ -41,6 +46,9 @@ int __init s3c2440_init(void)
{
printk("S3C2440: Initialising architecture\n");
+ s3c24xx_gpiocfg_default.set_pull = s3c_gpio_setpull_1up;
+ s3c24xx_gpiocfg_default.get_pull = s3c_gpio_getpull_1up;
+
/* change irq for watchdog */
s3c_device_wdt.resource[1].start = IRQ_S3C2440_WDT;