git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'iop-raid6' into async-tx-next
[pandora-kernel.git]
/
arch
/
arm
/
plat-s3c
/
dev-i2c1.c
diff --git
a/arch/arm/plat-s3c/dev-i2c1.c
b/arch/arm/plat-s3c/dev-i2c1.c
index
2387fbf
..
8349c46
100644
(file)
--- 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
*
/* 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/
*
* Ben Dooks <ben@simtec.co.uk>
* http://armlinux.simtec.co.uk/
*
@@
-47,9
+47,8
@@
static struct s3c2410_platform_i2c default_i2c_data1 __initdata = {
.flags = 0,
.bus_num = 1,
.slave_addr = 0x10,
.flags = 0,
.bus_num = 1,
.slave_addr = 0x10,
- .bus_freq = 100*1000,
- .max_freq = 400*1000,
- .sda_delay = S3C2410_IICLC_SDA_DELAY5 | S3C2410_IICLC_FILTER_ON,
+ .frequency = 100*1000,
+ .sda_delay = 100,
};
void __init s3c_i2c1_set_platdata(struct s3c2410_platform_i2c *pd)
};
void __init s3c_i2c1_set_platdata(struct s3c2410_platform_i2c *pd)