diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 12:14:40 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-15 18:40:26 -0500 |
commit | 3e1b776c2b9807d3af5945d5ece86dce9dfb0279 (patch) | |
tree | acad50c9e9e1b9a00c73f2d5aaec919408ba81ee /arch/arm/mach-s3c2440/mach-osiris.c | |
parent | a2205cd2cbfb8fb217e6036f08773a09d1b6d75e (diff) |
[ARM] S3C: Make i2c device definition common to plat-s3c
Make the device i2c0 common to plat-s3c and move the
definitions from arch/arm/plat-s3c24xx/devs.c
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-osiris.c')
-rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index 884a3c7ae75f..41a00f57e5da 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <mach/regs-mem.h> | 38 | #include <mach/regs-mem.h> |
39 | #include <mach/regs-lcd.h> | 39 | #include <mach/regs-lcd.h> |
40 | #include <plat/nand.h> | 40 | #include <plat/nand.h> |
41 | #include <plat/iic.h> | ||
41 | 42 | ||
42 | #include <linux/mtd/mtd.h> | 43 | #include <linux/mtd/mtd.h> |
43 | #include <linux/mtd/nand.h> | 44 | #include <linux/mtd/nand.h> |
@@ -335,7 +336,7 @@ static struct i2c_board_info osiris_i2c_devs[] __initdata = { | |||
335 | /* Standard Osiris devices */ | 336 | /* Standard Osiris devices */ |
336 | 337 | ||
337 | static struct platform_device *osiris_devices[] __initdata = { | 338 | static struct platform_device *osiris_devices[] __initdata = { |
338 | &s3c_device_i2c, | 339 | &s3c_device_i2c0, |
339 | &s3c_device_wdt, | 340 | &s3c_device_wdt, |
340 | &s3c_device_nand, | 341 | &s3c_device_nand, |
341 | &osiris_pcmcia, | 342 | &osiris_pcmcia, |
@@ -398,6 +399,8 @@ static void __init osiris_init(void) | |||
398 | sysdev_class_register(&osiris_pm_sysclass); | 399 | sysdev_class_register(&osiris_pm_sysclass); |
399 | sysdev_register(&osiris_pm_sysdev); | 400 | sysdev_register(&osiris_pm_sysdev); |
400 | 401 | ||
402 | s3c_i2c0_set_platdata(NULL); | ||
403 | |||
401 | i2c_register_board_info(0, osiris_i2c_devs, | 404 | i2c_register_board_info(0, osiris_i2c_devs, |
402 | ARRAY_SIZE(osiris_i2c_devs)); | 405 | ARRAY_SIZE(osiris_i2c_devs)); |
403 | 406 | ||