diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 14:07:19 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 14:07:19 +0100 |
| commit | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (patch) | |
| tree | 15ab3c23d05e98829741b03922b51b81fd102b64 /arch/arm/mach-s5p6440/setup-i2c0.c | |
| parent | 500b9fc922cbec572f4fd1436533bfaed5011262 (diff) | |
| parent | a68fefe0d2f364ac3d8497ef37dcad713c261103 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-s5p6440/setup-i2c0.c')
| -rw-r--r-- | arch/arm/mach-s5p6440/setup-i2c0.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p6440/setup-i2c0.c b/arch/arm/mach-s5p6440/setup-i2c0.c index 69e8a664aedb..2c99d14f7ac7 100644 --- a/arch/arm/mach-s5p6440/setup-i2c0.c +++ b/arch/arm/mach-s5p6440/setup-i2c0.c @@ -17,9 +17,14 @@ struct platform_device; /* don't need the contents */ +#include <linux/gpio.h> +#include <plat/gpio-cfg.h> #include <plat/iic.h> void s3c_i2c0_cfg_gpio(struct platform_device *dev) { - /* Will be populated later */ + s3c_gpio_cfgpin(S5P6440_GPB(5), S3C_GPIO_SFN(2)); + s3c_gpio_setpull(S5P6440_GPB(5), S3C_GPIO_PULL_UP); + s3c_gpio_cfgpin(S5P6440_GPB(6), S3C_GPIO_SFN(2)); + s3c_gpio_setpull(S5P6440_GPB(6), S3C_GPIO_PULL_UP); } |