aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c
diff options
context:
space:
mode:
authorBen Dooks <ben@simtec.co.uk>2009-03-27 06:52:13 -0400
committerBen Dooks <ben-linux@fluff.org>2009-04-07 05:18:33 -0400
commita192f7153bb33151f83440cd9c0442233a064bf1 (patch)
tree0bf8a18ea3ac34c12dddbe70f12d3a340906016a /arch/arm/plat-s3c
parentaa11e38ce6fe8846fec046a95cecd5d4690c48cd (diff)
i2c-s3c2410: sda_delay should be in ns, not clock ticks
The sda_delay field should be specified in ns, not in clock ticks as when using cpufreq we could be changing the bus rate. Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Diffstat (limited to 'arch/arm/plat-s3c')
-rw-r--r--arch/arm/plat-s3c/dev-i2c0.c2
-rw-r--r--arch/arm/plat-s3c/dev-i2c1.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c/dev-i2c0.c b/arch/arm/plat-s3c/dev-i2c0.c
index fe327074037e..8eecb466ab4c 100644
--- a/arch/arm/plat-s3c/dev-i2c0.c
+++ b/arch/arm/plat-s3c/dev-i2c0.c
@@ -52,7 +52,7 @@ static struct s3c2410_platform_i2c default_i2c_data0 __initdata = {
52 .slave_addr = 0x10, 52 .slave_addr = 0x10,
53 .bus_freq = 100*1000, 53 .bus_freq = 100*1000,
54 .max_freq = 400*1000, 54 .max_freq = 400*1000,
55 .sda_delay = S3C2410_IICLC_SDA_DELAY5 | S3C2410_IICLC_FILTER_ON, 55 .sda_delay = 100,
56}; 56};
57 57
58void __init s3c_i2c0_set_platdata(struct s3c2410_platform_i2c *pd) 58void __init s3c_i2c0_set_platdata(struct s3c2410_platform_i2c *pd)
diff --git a/arch/arm/plat-s3c/dev-i2c1.c b/arch/arm/plat-s3c/dev-i2c1.c
index 2387fbf57af6..4536e5bb50e5 100644
--- a/arch/arm/plat-s3c/dev-i2c1.c
+++ b/arch/arm/plat-s3c/dev-i2c1.c
@@ -49,7 +49,7 @@ static struct s3c2410_platform_i2c default_i2c_data1 __initdata = {
49 .slave_addr = 0x10, 49 .slave_addr = 0x10,
50 .bus_freq = 100*1000, 50 .bus_freq = 100*1000,
51 .max_freq = 400*1000, 51 .max_freq = 400*1000,
52 .sda_delay = S3C2410_IICLC_SDA_DELAY5 | S3C2410_IICLC_FILTER_ON, 52 .sda_delay = 100,
53}; 53};
54 54
55void __init s3c_i2c1_set_platdata(struct s3c2410_platform_i2c *pd) 55void __init s3c_i2c1_set_platdata(struct s3c2410_platform_i2c *pd)