From 1c0d52a383e809ad6cc0d17d8ddfdc80956653d3 Mon Sep 17 00:00:00 2001 From: Thomas Abraham Date: Tue, 7 Jun 2011 14:04:49 +0530 Subject: [PATCH] --- yaml --- r: 253254 b: refs/heads/master c: 0bf8fa04e80a562641f687547053f98670f25cf9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-exynos4.c | 29 +++++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1a4f34f15a5c..365988cec103 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27721a52d6c8e33327ec3cae9f730204be99d251 +refs/heads/master: 0bf8fa04e80a562641f687547053f98670f25cf9 diff --git a/trunk/drivers/gpio/gpio-exynos4.c b/trunk/drivers/gpio/gpio-exynos4.c index d54ca6adb660..9029835112e7 100644 --- a/trunk/drivers/gpio/gpio-exynos4.c +++ b/trunk/drivers/gpio/gpio-exynos4.c @@ -21,16 +21,37 @@ #include #include +int s3c_gpio_setpull_exynos4(struct s3c_gpio_chip *chip, + unsigned int off, s3c_gpio_pull_t pull) +{ + if (pull == S3C_GPIO_PULL_UP) + pull = 3; + + return s3c_gpio_setpull_updown(chip, off, pull); +} + +s3c_gpio_pull_t s3c_gpio_getpull_exynos4(struct s3c_gpio_chip *chip, + unsigned int off) +{ + s3c_gpio_pull_t pull; + + pull = s3c_gpio_getpull_updown(chip, off); + if (pull == 3) + pull = S3C_GPIO_PULL_UP; + + return pull; +} + static struct s3c_gpio_cfg gpio_cfg = { .set_config = s3c_gpio_setcfg_s3c64xx_4bit, - .set_pull = s3c_gpio_setpull_updown, - .get_pull = s3c_gpio_getpull_updown, + .set_pull = s3c_gpio_setpull_exynos4, + .get_pull = s3c_gpio_getpull_exynos4, }; static struct s3c_gpio_cfg gpio_cfg_noint = { .set_config = s3c_gpio_setcfg_s3c64xx_4bit, - .set_pull = s3c_gpio_setpull_updown, - .get_pull = s3c_gpio_getpull_updown, + .set_pull = s3c_gpio_setpull_exynos4, + .get_pull = s3c_gpio_getpull_exynos4, }; /*