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-n30.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-n30.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-n30.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c index 7a7c45d28fe7..1269e59d2940 100644 --- a/arch/arm/mach-s3c2410/mach-n30.c +++ b/arch/arm/mach-s3c2410/mach-n30.c | |||
@@ -320,7 +320,7 @@ static struct s3c2410fb_mach_info n30_fb_info __initdata = { | |||
320 | static struct platform_device *n30_devices[] __initdata = { | 320 | static struct platform_device *n30_devices[] __initdata = { |
321 | &s3c_device_lcd, | 321 | &s3c_device_lcd, |
322 | &s3c_device_wdt, | 322 | &s3c_device_wdt, |
323 | &s3c_device_i2c, | 323 | &s3c_device_i2c0, |
324 | &s3c_device_iis, | 324 | &s3c_device_iis, |
325 | &s3c_device_usb, | 325 | &s3c_device_usb, |
326 | &s3c_device_usbgadget, | 326 | &s3c_device_usbgadget, |
@@ -332,7 +332,7 @@ static struct platform_device *n30_devices[] __initdata = { | |||
332 | static struct platform_device *n35_devices[] __initdata = { | 332 | static struct platform_device *n35_devices[] __initdata = { |
333 | &s3c_device_lcd, | 333 | &s3c_device_lcd, |
334 | &s3c_device_wdt, | 334 | &s3c_device_wdt, |
335 | &s3c_device_i2c, | 335 | &s3c_device_i2c0, |
336 | &s3c_device_iis, | 336 | &s3c_device_iis, |
337 | &s3c_device_usbgadget, | 337 | &s3c_device_usbgadget, |
338 | &n35_button_device, | 338 | &n35_button_device, |
@@ -501,7 +501,7 @@ static void __init n30_init_irq(void) | |||
501 | static void __init n30_init(void) | 501 | static void __init n30_init(void) |
502 | { | 502 | { |
503 | s3c24xx_fb_set_platdata(&n30_fb_info); | 503 | s3c24xx_fb_set_platdata(&n30_fb_info); |
504 | s3c_device_i2c.dev.platform_data = &n30_i2ccfg; | 504 | s3c_device_i2c0.dev.platform_data = &n30_i2ccfg; |
505 | s3c24xx_udc_set_platdata(&n30_udc_cfg); | 505 | s3c24xx_udc_set_platdata(&n30_udc_cfg); |
506 | 506 | ||
507 | /* Turn off suspend on both USB ports, and switch the | 507 | /* Turn off suspend on both USB ports, and switch the |