From 556ca22793e65a44c76d81193dfbe27848c4e84c Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Fri, 1 Oct 2010 19:38:26 +0900 Subject: [PATCH] --- yaml --- r: 221112 b: refs/heads/master c: 54bce6c73dcd6d150d917e954154521de116e17b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s5p64x0/setup-i2c1.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 57144955501a..1826267e1c6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aef698a72fbb8ba97cff1abb1fdb035c791bd106 +refs/heads/master: 54bce6c73dcd6d150d917e954154521de116e17b diff --git a/trunk/arch/arm/mach-s5p64x0/setup-i2c1.c b/trunk/arch/arm/mach-s5p64x0/setup-i2c1.c index 5d5dd3c4edba..6ad3b986021c 100644 --- a/trunk/arch/arm/mach-s5p64x0/setup-i2c1.c +++ b/trunk/arch/arm/mach-s5p64x0/setup-i2c1.c @@ -25,16 +25,14 @@ struct platform_device; /* don't need the contents */ void s5p6440_i2c1_cfg_gpio(struct platform_device *dev) { - s3c_gpio_cfgpin_range(S5P6440_GPR(9), 2, S3C_GPIO_SFN(6)); - s3c_gpio_setpull(S5P6440_GPR(9), S3C_GPIO_PULL_UP); - s3c_gpio_setpull(S5P6440_GPR(10), S3C_GPIO_PULL_UP); + s3c_gpio_cfgall_range(S5P6440_GPR(9), 2, + S3C_GPIO_SFN(6), S3C_GPIO_PULL_UP); } void s5p6450_i2c1_cfg_gpio(struct platform_device *dev) { - s3c_gpio_cfgpin_range(S5P6450_GPR(9), 2, S3C_GPIO_SFN(6)); - s3c_gpio_setpull(S5P6450_GPR(9), S3C_GPIO_PULL_UP); - s3c_gpio_setpull(S5P6450_GPR(10), S3C_GPIO_PULL_UP); + s3c_gpio_cfgall_range(S5P6450_GPR(9), 2, + S3C_GPIO_SFN(6), S3C_GPIO_PULL_UP); } void s3c_i2c1_cfg_gpio(struct platform_device *dev) { }