diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-31 16:14:40 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-15 23:40:26 +0000 |
| commit | 3e1b776c2b9807d3af5945d5ece86dce9dfb0279 (patch) | |
| tree | acad50c9e9e1b9a00c73f2d5aaec919408ba81ee /arch/arm/mach-s3c2440/mach-osiris.c | |
| parent | a2205cd2cbfb8fb217e6036f08773a09d1b6d75e (diff) | |
| download | op-kernel-dev-3e1b776c2b9807d3af5945d5ece86dce9dfb0279.zip op-kernel-dev-3e1b776c2b9807d3af5945d5ece86dce9dfb0279.tar.gz | |
[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 884a3c7..41a00f5 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c @@ -38,6 +38,7 @@ #include <mach/regs-mem.h> #include <mach/regs-lcd.h> #include <plat/nand.h> +#include <plat/iic.h> #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> @@ -335,7 +336,7 @@ static struct i2c_board_info osiris_i2c_devs[] __initdata = { /* Standard Osiris devices */ static struct platform_device *osiris_devices[] __initdata = { - &s3c_device_i2c, + &s3c_device_i2c0, &s3c_device_wdt, &s3c_device_nand, &osiris_pcmcia, @@ -398,6 +399,8 @@ static void __init osiris_init(void) sysdev_class_register(&osiris_pm_sysclass); sysdev_register(&osiris_pm_sysdev); + s3c_i2c0_set_platdata(NULL); + i2c_register_board_info(0, osiris_i2c_devs, ARRAY_SIZE(osiris_i2c_devs)); |
