diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 16:32:47 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 16:32:47 +0000 |
commit | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (patch) | |
tree | dcb8a23b0245d3d4d2719d7ea987f7eee608c553 /arch/arm/mach-exynos4/setup-i2c2.c | |
parent | 9b963f32c38b4c7d2da667e4458967b550f30bee (diff) | |
parent | b0b6ff0b21057bb8e58b0be8b427a4713fd4b5a5 (diff) | |
download | blackbird-op-linux-9ced9f03d12d7539e86b0bff5bc750153c976c34.tar.gz blackbird-op-linux-9ced9f03d12d7539e86b0bff5bc750153c976c34.zip |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-exynos4/setup-i2c2.c')
-rw-r--r-- | arch/arm/mach-exynos4/setup-i2c2.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/setup-i2c2.c b/arch/arm/mach-exynos4/setup-i2c2.c new file mode 100644 index 000000000000..2694b19e8b37 --- /dev/null +++ b/arch/arm/mach-exynos4/setup-i2c2.c @@ -0,0 +1,23 @@ +/* + * linux/arch/arm/mach-exynos4/setup-i2c2.c + * + * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd. + * + * I2C2 GPIO configuration. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +struct platform_device; /* don't need the contents */ + +#include <linux/gpio.h> +#include <plat/iic.h> +#include <plat/gpio-cfg.h> + +void s3c_i2c2_cfg_gpio(struct platform_device *dev) +{ + s3c_gpio_cfgall_range(EXYNOS4_GPA0(6), 2, + S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP); +} |