From f781b802e0254b7a7271ada1a54dc6e56ac24dc2 Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Fri, 1 Oct 2010 16:05:07 +0900 Subject: [PATCH] --- yaml --- r: 221103 b: refs/heads/master c: ce5d3ac1f57b7a4ff28c57ebef709b8f9fd30fab h: refs/heads/master i: 221101: 2d19eb3e7861bf1c4d35184b62b8fb80982be8a6 221099: 5df30f5c00f5dff7148e99e29d6181f12bd4c776 221095: 6e387ca4d49414521a0ba1b716152f90f36989cc 221087: 32e8b689f599a9862224112af85c97236e44c6c3 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s5pv310/setup-i2c0.c | 3 +-- trunk/arch/arm/mach-s5pv310/setup-i2c1.c | 3 +-- trunk/arch/arm/mach-s5pv310/setup-i2c2.c | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index d353db7bd713..71819e0e6cd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64c5bd841b5789e118f358b684090585f14be6cf +refs/heads/master: ce5d3ac1f57b7a4ff28c57ebef709b8f9fd30fab diff --git a/trunk/arch/arm/mach-s5pv310/setup-i2c0.c b/trunk/arch/arm/mach-s5pv310/setup-i2c0.c index 436712807383..17c54c89e736 100644 --- a/trunk/arch/arm/mach-s5pv310/setup-i2c0.c +++ b/trunk/arch/arm/mach-s5pv310/setup-i2c0.c @@ -21,8 +21,7 @@ struct platform_device; /* don't need the contents */ void s3c_i2c0_cfg_gpio(struct platform_device *dev) { - s3c_gpio_cfgpin(S5PV310_GPD1(0), S3C_GPIO_SFN(2)); + s3c_gpio_cfgpin_range(S5PV310_GPD1(0), 2, S3C_GPIO_SFN(2)); s3c_gpio_setpull(S5PV310_GPD1(0), S3C_GPIO_PULL_UP); - s3c_gpio_cfgpin(S5PV310_GPD1(1), S3C_GPIO_SFN(2)); s3c_gpio_setpull(S5PV310_GPD1(1), S3C_GPIO_PULL_UP); } diff --git a/trunk/arch/arm/mach-s5pv310/setup-i2c1.c b/trunk/arch/arm/mach-s5pv310/setup-i2c1.c index 1ecd5bc35b5a..1740c9f03718 100644 --- a/trunk/arch/arm/mach-s5pv310/setup-i2c1.c +++ b/trunk/arch/arm/mach-s5pv310/setup-i2c1.c @@ -18,8 +18,7 @@ struct platform_device; /* don't need the contents */ void s3c_i2c1_cfg_gpio(struct platform_device *dev) { - s3c_gpio_cfgpin(S5PV310_GPD1(2), S3C_GPIO_SFN(2)); + s3c_gpio_cfgpin_range(S5PV310_GPD1(2), 2, S3C_GPIO_SFN(2)); s3c_gpio_setpull(S5PV310_GPD1(2), S3C_GPIO_PULL_UP); - s3c_gpio_cfgpin(S5PV310_GPD1(3), S3C_GPIO_SFN(2)); s3c_gpio_setpull(S5PV310_GPD1(3), S3C_GPIO_PULL_UP); } diff --git a/trunk/arch/arm/mach-s5pv310/setup-i2c2.c b/trunk/arch/arm/mach-s5pv310/setup-i2c2.c index 4c0d8def660a..860f77beec52 100644 --- a/trunk/arch/arm/mach-s5pv310/setup-i2c2.c +++ b/trunk/arch/arm/mach-s5pv310/setup-i2c2.c @@ -18,8 +18,7 @@ struct platform_device; /* don't need the contents */ void s3c_i2c2_cfg_gpio(struct platform_device *dev) { - s3c_gpio_cfgpin(S5PV310_GPA0(6), S3C_GPIO_SFN(3)); + s3c_gpio_cfgpin_range(S5PV310_GPA0(6), 2, S3C_GPIO_SFN(3)); s3c_gpio_setpull(S5PV310_GPA0(6), S3C_GPIO_PULL_UP); - s3c_gpio_cfgpin(S5PV310_GPA0(7), S3C_GPIO_SFN(3)); s3c_gpio_setpull(S5PV310_GPA0(7), S3C_GPIO_PULL_UP); }