Skip to content

Commit

Permalink
ARM: S3C2413: Update GPIO pull-up support
Browse files Browse the repository at this point in the history
Ensure the right get/set pull code is selected and assigned to the GPIO
core.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
  • Loading branch information
Ben Dooks committed May 10, 2010
1 parent e12ef7f commit eb90de4
Showing 2 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-s3c2416/Kconfig
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions arch/arm/mach-s3c2416/s3c2416.c
Original file line number Diff line number Diff line change
@@ -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));
}

0 comments on commit eb90de4

Please sign in to comment.