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-s3c2410/mach-bast.c | |
| parent | [ARM] S3C: Add SDHCI (HSMMC) channel 1 device definition (diff) | |
| download | linux-dev-3e1b776c2b9807d3af5945d5ece86dce9dfb0279.tar.xz linux-dev-3e1b776c2b9807d3af5945d5ece86dce9dfb0279.zip | |
[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-s3c2410/mach-bast.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index c04c24444e0d..01bd76725b92 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c @@ -406,7 +406,7 @@ static struct platform_device bast_sio = { * standard 100KHz i2c bus frequency */ -static struct s3c2410_platform_i2c bast_i2c_info = { +static struct s3c2410_platform_i2c __initdata bast_i2c_info = { .flags = 0, .slave_addr = 0x10, .bus_freq = 100*1000, @@ -553,7 +553,7 @@ static struct platform_device *bast_devices[] __initdata = { &s3c_device_usb, &s3c_device_lcd, &s3c_device_wdt, - &s3c_device_i2c, + &s3c_device_i2c0, &s3c_device_rtc, &s3c_device_nand, &bast_device_dm9k, @@ -588,7 +588,8 @@ static void __init bast_map_io(void) s3c24xx_register_clocks(bast_clocks, ARRAY_SIZE(bast_clocks)); s3c_device_nand.dev.platform_data = &bast_nand_info; - s3c_device_i2c.dev.platform_data = &bast_i2c_info; + + s3c_i2c0_set_platdata(&bast_i2c_info); s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc)); s3c24xx_init_clocks(0); |