diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-09-28 11:29:48 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-11-30 20:34:17 -0500 |
commit | 7bcb7eda99f1091055d547aee1a1d8e65b59c592 (patch) | |
tree | c045521f5a16aa60022e1c95806b1a507578f27e /arch | |
parent | 372359eca4569f9321c820d6e5259e19eb4e63ad (diff) |
ARM: N30: Use s3c_i2c0_set_platdata() to set I2C platform data
Fix mach-n30.c to use the s3c_i2c0_set_platdata() call to register the
platform data with the system to get rid of any reliance on having a real
device structure available in memory.
Since s3c_i2c0_set_platdata() copies the data, mark the original as
__initdata so it is thrown away.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-n30.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c index 0f6ed61af415..0405712c2263 100644 --- a/arch/arm/mach-s3c2410/mach-n30.c +++ b/arch/arm/mach-s3c2410/mach-n30.c | |||
@@ -338,7 +338,7 @@ static struct platform_device *n35_devices[] __initdata = { | |||
338 | &n35_button_device, | 338 | &n35_button_device, |
339 | }; | 339 | }; |
340 | 340 | ||
341 | static struct s3c2410_platform_i2c n30_i2ccfg = { | 341 | static struct s3c2410_platform_i2c __initdata n30_i2ccfg = { |
342 | .flags = 0, | 342 | .flags = 0, |
343 | .slave_addr = 0x10, | 343 | .slave_addr = 0x10, |
344 | .frequency = 10*1000, | 344 | .frequency = 10*1000, |
@@ -500,8 +500,8 @@ static void __init n30_init_irq(void) | |||
500 | static void __init n30_init(void) | 500 | static void __init n30_init(void) |
501 | { | 501 | { |
502 | s3c24xx_fb_set_platdata(&n30_fb_info); | 502 | s3c24xx_fb_set_platdata(&n30_fb_info); |
503 | s3c_device_i2c0.dev.platform_data = &n30_i2ccfg; | ||
504 | s3c24xx_udc_set_platdata(&n30_udc_cfg); | 503 | s3c24xx_udc_set_platdata(&n30_udc_cfg); |
504 | s3c_i2c0_set_platdata(&n30_i2ccfg); | ||
505 | 505 | ||
506 | /* Turn off suspend on both USB ports, and switch the | 506 | /* Turn off suspend on both USB ports, and switch the |
507 | * selectable USB port to USB device mode. */ | 507 | * selectable USB port to USB device mode. */ |