summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c/dev-i2c1.c
diff options
context:
space:
mode:
authorDaniel Silverstone2009-03-13 14:53:46 +0100
committerBen Dooks2009-04-07 11:18:33 +0200
commitc564e6ae6c5aa6e3995ff87ed4a32b4788ad5109 (patch)
treeb773106104d9897d945709d3bff8a56ff6586da8 /arch/arm/plat-s3c/dev-i2c1.c
parenti2c-s3c2410: sda_delay should be in ns, not clock ticks (diff)
downloadkernel-qcow2-linux-c564e6ae6c5aa6e3995ff87ed4a32b4788ad5109.tar.gz
kernel-qcow2-linux-c564e6ae6c5aa6e3995ff87ed4a32b4788ad5109.tar.xz
kernel-qcow2-linux-c564e6ae6c5aa6e3995ff87ed4a32b4788ad5109.zip
i2c-s3c2410: Simplify bus frequency calculation
The platform data for the i2c-s3c2410 driver used to allow a min, max and desired frequency for the I2C bus. This patch reduces it to simply a desired frequency ceiling and corrects all the uses of the platform data appropriately. This means, for example, that on a system with a 66MHz fclk, a request for 100KHz will achieve 65KHz which is safe and acceptable, rather than 378KHz which it would have achieved without this change. Signed-off-by: Simtec Linux Team <linux@simtec.co.uk> Signed-off-by: Daniel Silverstone <dsilvers@simtec.co.uk> [ben-linux@fluff.org: tidy subject and description] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c/dev-i2c1.c')
-rw-r--r--arch/arm/plat-s3c/dev-i2c1.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/plat-s3c/dev-i2c1.c b/arch/arm/plat-s3c/dev-i2c1.c
index 4536e5bb50e5..8349c462788c 100644
--- a/arch/arm/plat-s3c/dev-i2c1.c
+++ b/arch/arm/plat-s3c/dev-i2c1.c
@@ -1,6 +1,6 @@
/* linux/arch/arm/plat-s3c/dev-i2c1.c
*
- * Copyright 2008 Simtec Electronics
+ * Copyright 2008,2009 Simtec Electronics
* Ben Dooks <ben@simtec.co.uk>
* http://armlinux.simtec.co.uk/
*
@@ -47,8 +47,7 @@ static struct s3c2410_platform_i2c default_i2c_data1 __initdata = {
.flags = 0,
.bus_num = 1,
.slave_addr = 0x10,
- .bus_freq = 100*1000,
- .max_freq = 400*1000,
+ .frequency = 100*1000,
.sda_delay = 100,
};