From 243768dbfd67bbfaedbe475127fc87ccdaed15e4 Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Wed, 1 Sep 2010 13:36:59 +0900 Subject: [PATCH] --- yaml --- r: 212638 b: refs/heads/master c: 2853a0efc3031dec88b47bbc50b8a6b3fe9e3cac h: refs/heads/master v: v3 --- [refs] | 2 +- .../arch/arm/mach-s5p64x0/include/mach/i2c.h | 17 +++++++++++++ .../setup-i2c0.c | 24 ++++++++++++++----- .../setup-i2c1.c | 20 ++++++++++++---- 4 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 trunk/arch/arm/mach-s5p64x0/include/mach/i2c.h rename trunk/arch/arm/{mach-s5p6440 => mach-s5p64x0}/setup-i2c0.c (52%) rename trunk/arch/arm/{mach-s5p6440 => mach-s5p64x0}/setup-i2c1.c (55%) diff --git a/[refs] b/[refs] index cc618b4ef9be..49dc7d8e36c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1fee5824cc2f145c2d926939ff88250245a7ac9 +refs/heads/master: 2853a0efc3031dec88b47bbc50b8a6b3fe9e3cac diff --git a/trunk/arch/arm/mach-s5p64x0/include/mach/i2c.h b/trunk/arch/arm/mach-s5p64x0/include/mach/i2c.h new file mode 100644 index 000000000000..887d25209e8e --- /dev/null +++ b/trunk/arch/arm/mach-s5p64x0/include/mach/i2c.h @@ -0,0 +1,17 @@ +/* linux/arch/arm/mach-s5p64x0/include/mach/i2c.h + * + * Copyright (c) 2010 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * + * S5P64X0 I2C 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. +*/ + +extern void s5p6440_i2c0_cfg_gpio(struct platform_device *dev); +extern void s5p6440_i2c1_cfg_gpio(struct platform_device *dev); + +extern void s5p6450_i2c0_cfg_gpio(struct platform_device *dev); +extern void s5p6450_i2c1_cfg_gpio(struct platform_device *dev); diff --git a/trunk/arch/arm/mach-s5p6440/setup-i2c0.c b/trunk/arch/arm/mach-s5p64x0/setup-i2c0.c similarity index 52% rename from trunk/arch/arm/mach-s5p6440/setup-i2c0.c rename to trunk/arch/arm/mach-s5p64x0/setup-i2c0.c index 2c99d14f7ac7..dc4cc65a5019 100644 --- a/trunk/arch/arm/mach-s5p6440/setup-i2c0.c +++ b/trunk/arch/arm/mach-s5p64x0/setup-i2c0.c @@ -1,11 +1,11 @@ -/* linux/arch/arm/mach-s5p6440/setup-i2c0.c +/* linux/arch/arm/mach-s5p64x0/setup-i2c0.c * - * Copyright (c) 2009 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ + * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd. + * http://www.samsung.com * * I2C0 GPIO configuration. * - * Based on plat-s3c64xx/setup-i2c0.c + * Based on plat-s3c64x0/setup-i2c0.c * * 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 @@ -14,17 +14,29 @@ #include #include +#include struct platform_device; /* don't need the contents */ -#include #include #include -void s3c_i2c0_cfg_gpio(struct platform_device *dev) +#include + +void s5p6440_i2c0_cfg_gpio(struct platform_device *dev) { 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); } + +void s5p6450_i2c0_cfg_gpio(struct platform_device *dev) +{ + s3c_gpio_cfgpin(S5P6450_GPB(5), S3C_GPIO_SFN(2)); + s3c_gpio_setpull(S5P6450_GPB(5), S3C_GPIO_PULL_UP); + s3c_gpio_cfgpin(S5P6450_GPB(6), S3C_GPIO_SFN(2)); + s3c_gpio_setpull(S5P6450_GPB(6), S3C_GPIO_PULL_UP); +} + +void s3c_i2c0_cfg_gpio(struct platform_device *dev) { } diff --git a/trunk/arch/arm/mach-s5p6440/setup-i2c1.c b/trunk/arch/arm/mach-s5p64x0/setup-i2c1.c similarity index 55% rename from trunk/arch/arm/mach-s5p6440/setup-i2c1.c rename to trunk/arch/arm/mach-s5p64x0/setup-i2c1.c index 9a1537f786e0..2edd7912f8e4 100644 --- a/trunk/arch/arm/mach-s5p6440/setup-i2c1.c +++ b/trunk/arch/arm/mach-s5p64x0/setup-i2c1.c @@ -1,7 +1,7 @@ -/* linux/arch/arm/mach-s5p6440/setup-i2c1.c +/* linux/arch/arm/mach-s5p64xx/setup-i2c1.c * - * Copyright (c) 2009 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ + * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd. + * http://www.samsung.com * * I2C1 GPIO configuration. * @@ -21,10 +21,22 @@ struct platform_device; /* don't need the contents */ #include #include -void s3c_i2c1_cfg_gpio(struct platform_device *dev) +#include + +void s5p6440_i2c1_cfg_gpio(struct platform_device *dev) { s3c_gpio_cfgpin(S5P6440_GPR(9), S3C_GPIO_SFN(6)); s3c_gpio_setpull(S5P6440_GPR(9), S3C_GPIO_PULL_UP); s3c_gpio_cfgpin(S5P6440_GPR(10), S3C_GPIO_SFN(6)); s3c_gpio_setpull(S5P6440_GPR(10), S3C_GPIO_PULL_UP); } + +void s5p6450_i2c1_cfg_gpio(struct platform_device *dev) +{ + s3c_gpio_cfgpin(S5P6450_GPR(9), S3C_GPIO_SFN(6)); + s3c_gpio_setpull(S5P6450_GPR(9), S3C_GPIO_PULL_UP); + s3c_gpio_cfgpin(S5P6450_GPR(10), S3C_GPIO_SFN(6)); + s3c_gpio_setpull(S5P6450_GPR(10), S3C_GPIO_PULL_UP); +} + +void s3c_i2c1_cfg_gpio(struct platform_device *dev) { }