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-s3c2410/mach-h1940.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-s3c2410/mach-h1940.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 836508b829bb..821a1668c3ac 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <mach/h1940-latch.h> | 39 | #include <mach/h1940-latch.h> |
40 | #include <mach/fb.h> | 40 | #include <mach/fb.h> |
41 | #include <plat/udc.h> | 41 | #include <plat/udc.h> |
42 | #include <plat/iic.h> | ||
42 | 43 | ||
43 | #include <plat/clock.h> | 44 | #include <plat/clock.h> |
44 | #include <plat/devs.h> | 45 | #include <plat/devs.h> |
@@ -184,7 +185,7 @@ static struct platform_device *h1940_devices[] __initdata = { | |||
184 | &s3c_device_usb, | 185 | &s3c_device_usb, |
185 | &s3c_device_lcd, | 186 | &s3c_device_lcd, |
186 | &s3c_device_wdt, | 187 | &s3c_device_wdt, |
187 | &s3c_device_i2c, | 188 | &s3c_device_i2c0, |
188 | &s3c_device_iis, | 189 | &s3c_device_iis, |
189 | &s3c_device_usbgadget, | 190 | &s3c_device_usbgadget, |
190 | &s3c_device_leds, | 191 | &s3c_device_leds, |
@@ -216,6 +217,7 @@ static void __init h1940_init(void) | |||
216 | 217 | ||
217 | s3c24xx_fb_set_platdata(&h1940_fb_info); | 218 | s3c24xx_fb_set_platdata(&h1940_fb_info); |
218 | s3c24xx_udc_set_platdata(&h1940_udc_cfg); | 219 | s3c24xx_udc_set_platdata(&h1940_udc_cfg); |
220 | s3c_i2c0_set_platdata(NULL); | ||
219 | 221 | ||
220 | /* Turn off suspend on both USB ports, and switch the | 222 | /* Turn off suspend on both USB ports, and switch the |
221 | * selectable USB port to USB device mode. */ | 223 | * selectable USB port to USB device mode. */ |