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
[ARM] S3C: Add i2c1 device definition
[pandora-kernel.git]
/
arch
/
arm
/
plat-s3c
/
dev-i2c0.c
diff --git
a/arch/arm/plat-s3c/dev-i2c0.c
b/arch/arm/plat-s3c/dev-i2c0.c
index
21870fd
..
2c0128c
100644
(file)
--- a/
arch/arm/plat-s3c/dev-i2c0.c
+++ b/
arch/arm/plat-s3c/dev-i2c0.c
@@
-37,12
+37,16
@@
static struct resource s3c_i2c_resource[] = {
struct platform_device s3c_device_i2c0 = {
.name = "s3c2410-i2c",
struct platform_device s3c_device_i2c0 = {
.name = "s3c2410-i2c",
+#ifdef CONFIG_S3C_DEV_I2C1
+ .id = 0,
+#else
.id = -1,
.id = -1,
+#endif
.num_resources = ARRAY_SIZE(s3c_i2c_resource),
.resource = s3c_i2c_resource,
};
.num_resources = ARRAY_SIZE(s3c_i2c_resource),
.resource = s3c_i2c_resource,
};
-st
ruct s3c2410_platform_i2c default_i2c_data
__initdata = {
+st
atic struct s3c2410_platform_i2c default_i2c_data0
__initdata = {
.flags = 0,
.slave_addr = 0x10,
.bus_freq = 100*1000,
.flags = 0,
.slave_addr = 0x10,
.bus_freq = 100*1000,
@@
-55,7
+59,7
@@
void __init s3c_i2c0_set_platdata(struct s3c2410_platform_i2c *pd)
struct s3c2410_platform_i2c *npd;
if (!pd)
struct s3c2410_platform_i2c *npd;
if (!pd)
- pd = &default_i2c_data;
+ pd = &default_i2c_data
0
;
npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);
if (!npd)
npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL);
if (!npd)