From 2489007e7d740ccbc3e0a202914e243ad5178787 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Sat, 22 Sep 2012 09:48:20 +0200 Subject: merge opensource jb u5 Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2 --- arch/arm/mach-exynos/setup-i2c4.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'arch/arm/mach-exynos/setup-i2c4.c') diff --git a/arch/arm/mach-exynos/setup-i2c4.c b/arch/arm/mach-exynos/setup-i2c4.c index 5e81e78..234f21f 100644 --- a/arch/arm/mach-exynos/setup-i2c4.c +++ b/arch/arm/mach-exynos/setup-i2c4.c @@ -19,6 +19,10 @@ struct platform_device; /* don't need the contents */ void s3c_i2c4_cfg_gpio(struct platform_device *dev) { +#if defined(CONFIG_MACH_U1_NA_USCC) +s3c_gpio_cfgall_range(EXYNOS4_GPB(0), 1, + S3C_GPIO_OUTPUT, S3C_GPIO_PULL_NONE); +#else if (soc_is_exynos4210()) s3c_gpio_cfgall_range(EXYNOS4_GPB(2), 2, S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP); @@ -28,4 +32,5 @@ void s3c_i2c4_cfg_gpio(struct platform_device *dev) else s3c_gpio_cfgall_range(EXYNOS5_GPA2(0), 2, S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP); +#endif } -- cgit v1.1