diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 17:35:09 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 17:35:09 +0100 |
| commit | bc7ecbcbc2c0ff235382077b55de7896775afc16 (patch) | |
| tree | 9918b2f3fdeebd9c99a308af94d86bc13c80d0c8 /arch/arm/plat-s5pc1xx/setup-i2c0.c | |
| parent | ARM: RealView: Fix typo in the RealView/PBX Kconfig entry (diff) | |
| parent | [ARM] pxa/zeus: default configuration for Arcom Zeus SBC. (diff) | |
| download | linux-bc7ecbcbc2c0ff235382077b55de7896775afc16.tar.xz linux-bc7ecbcbc2c0ff235382077b55de7896775afc16.zip | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/plat-s5pc1xx/setup-i2c0.c')
| -rw-r--r-- | arch/arm/plat-s5pc1xx/setup-i2c0.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/plat-s5pc1xx/setup-i2c0.c b/arch/arm/plat-s5pc1xx/setup-i2c0.c index 3d00c025fffb..5e4a7c3a231e 100644 --- a/arch/arm/plat-s5pc1xx/setup-i2c0.c +++ b/arch/arm/plat-s5pc1xx/setup-i2c0.c @@ -17,9 +17,14 @@ struct platform_device; /* don't need the contents */ +#include <linux/gpio.h> #include <plat/iic.h> +#include <plat/gpio-cfg.h> void s3c_i2c0_cfg_gpio(struct platform_device *dev) { - /* Pin configuration would be needed */ + s3c_gpio_cfgpin(S5PC100_GPD(3), S3C_GPIO_SFN(2)); + s3c_gpio_setpull(S5PC100_GPD(3), S3C_GPIO_PULL_UP); + s3c_gpio_cfgpin(S5PC100_GPD(4), S3C_GPIO_SFN(2)); + s3c_gpio_setpull(S5PC100_GPD(4), S3C_GPIO_PULL_UP); } |