From 1213f134b2239a37dd150dcde26b4628613ec134 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Fri, 31 Oct 2008 16:14:51 +0000 Subject: [PATCH] --- yaml --- r: 123887 b: refs/heads/master c: 55132b8b4630a4b03d5c5556808c8d3866381536 h: refs/heads/master i: 123885: def667da6a25658b4e3e6743f617e6caa8768d94 123883: c0bdbb8d3589d546ee34e1becceb7405e0116c4d 123879: 0afdc36ddae8c0a698b783721cbbd034f87172b5 123871: f9ded02d8e55df6164690930d44445be324aa0dd v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-s3c64xx/Kconfig | 11 +++++++++ trunk/arch/arm/plat-s3c64xx/Makefile | 4 +++ trunk/arch/arm/plat-s3c64xx/setup-i2c0.c | 31 ++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 trunk/arch/arm/plat-s3c64xx/setup-i2c0.c diff --git a/[refs] b/[refs] index 871af9cd1489..a747f40c502f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26da1bfc567e10ca20cf2ffa97dcdcbd5112275b +refs/heads/master: 55132b8b4630a4b03d5c5556808c8d3866381536 diff --git a/trunk/arch/arm/plat-s3c64xx/Kconfig b/trunk/arch/arm/plat-s3c64xx/Kconfig index 842200abeb36..0bcbe663e2f0 100644 --- a/trunk/arch/arm/plat-s3c64xx/Kconfig +++ b/trunk/arch/arm/plat-s3c64xx/Kconfig @@ -37,4 +37,15 @@ config CPU_S3C6400_CLOCK Common clock support code for the S3C6400 that is shared by other CPUs in the series, such as the S3C6410. +# platform specific device setup + +config S3C64XX_SETUP_I2C0 + bool + default y + help + Common setup code for i2c bus 0. + + Note, currently since i2c0 is always compiled, this setup helper + is always compiled with it. + endif diff --git a/trunk/arch/arm/plat-s3c64xx/Makefile b/trunk/arch/arm/plat-s3c64xx/Makefile index a5b7c388351e..469f066daab7 100644 --- a/trunk/arch/arm/plat-s3c64xx/Makefile +++ b/trunk/arch/arm/plat-s3c64xx/Makefile @@ -23,3 +23,7 @@ obj-y += gpiolib.o obj-$(CONFIG_CPU_S3C6400_INIT) += s3c6400-init.o obj-$(CONFIG_CPU_S3C6400_CLOCK) += s3c6400-clock.o + +# Device setup + +obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o diff --git a/trunk/arch/arm/plat-s3c64xx/setup-i2c0.c b/trunk/arch/arm/plat-s3c64xx/setup-i2c0.c new file mode 100644 index 000000000000..364480763728 --- /dev/null +++ b/trunk/arch/arm/plat-s3c64xx/setup-i2c0.c @@ -0,0 +1,31 @@ +/* linux/arch/arm/plat-s3c64xx/setup-i2c0.c + * + * Copyright 2008 Openmoko, Inc. + * Copyright 2008 Simtec Electronics + * Ben Dooks + * http://armlinux.simtec.co.uk/ + * + * Base S3C64XX I2C bus 0 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. +*/ + +#include +#include + +struct platform_device; /* don't need the contents */ + +#include +#include +#include +#include + +void s3c_i2c0_cfg_gpio(struct platform_device *dev) +{ + s3c_gpio_cfgpin(S3C64XX_GPB(5), S3C64XX_GPB5_I2C_SCL0); + s3c_gpio_cfgpin(S3C64XX_GPB(6), S3C64XX_GPB6_I2C_SDA0); + s3c_gpio_setpull(S3C64XX_GPB(5), S3C_GPIO_PULL_UP); + s3c_gpio_setpull(S3C64XX_GPB(6), S3C_GPIO_PULL_UP); +}