diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 16:14:55 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-15 23:56:41 +0000 |
| commit | 1aba834da12989bb769d1dcbf6b0ea29f730c92c (patch) | |
| tree | 4f06c055eb265919ab137a49a21d3a5ace5d393d /arch/arm/plat-s3c/dev-i2c0.c | |
| parent | 8f995cc3ac94b114fe84782b023d8706d1adf960 (diff) | |
| download | kernel-crypto-1aba834da12989bb769d1dcbf6b0ea29f730c92c.tar.gz kernel-crypto-1aba834da12989bb769d1dcbf6b0ea29f730c92c.tar.xz kernel-crypto-1aba834da12989bb769d1dcbf6b0ea29f730c92c.zip | |
[ARM] S3C: Add i2c1 device definition
Add device definition and support functions for the
second i2c device (i2c1). If this is selected, the first
i2c bus will become index 0 instead of index -1.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c/dev-i2c0.c')
| -rw-r--r-- | arch/arm/plat-s3c/dev-i2c0.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c/dev-i2c0.c b/arch/arm/plat-s3c/dev-i2c0.c index 21870fd2ec9..2c0128c77c6 100644 --- 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", +#ifdef CONFIG_S3C_DEV_I2C1 + .id = 0, +#else .id = -1, +#endif .num_resources = ARRAY_SIZE(s3c_i2c_resource), .resource = s3c_i2c_resource, }; -struct s3c2410_platform_i2c default_i2c_data __initdata = { +static struct s3c2410_platform_i2c default_i2c_data0 __initdata = { .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) - pd = &default_i2c_data; + pd = &default_i2c_data0; npd = kmemdup(pd, sizeof(struct s3c2410_platform_i2c), GFP_KERNEL); if (!npd) |