aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2013-02-18 20:53:05 -0500
committerSimon Horman <horms+renesas@verge.net.au>2013-03-12 13:13:20 -0400
commite792120264ee869dc98bdec3842aa5731de0705b (patch)
tree9f0d5d137c75df2c7b654bc85d0b4ed6ae39bb46
parent916ddc355f061b636a71ee5e1d0eb977ee8a6938 (diff)
ARM: shmobile: r8a7779: Do not initialise i2c as an early device
It is sufficient to initialise i2c as a late device. Cc: Magnus Damm <magnus.damm@gmail.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/mach-shmobile/setup-r8a7779.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index b1f7a45b56b9..7f8daf17947c 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -333,7 +333,7 @@ static struct platform_device *r8a7779_devices_dt[] __initdata = {
333 &tmu01_device, 333 &tmu01_device,
334}; 334};
335 335
336static struct platform_device *r8a7779_early_devices[] __initdata = { 336static struct platform_device *r8a7779_late_devices[] __initdata = {
337 &i2c0_device, 337 &i2c0_device,
338 &i2c1_device, 338 &i2c1_device,
339 &i2c2_device, 339 &i2c2_device,
@@ -352,8 +352,8 @@ void __init r8a7779_add_standard_devices(void)
352 352
353 platform_add_devices(r8a7779_devices_dt, 353 platform_add_devices(r8a7779_devices_dt,
354 ARRAY_SIZE(r8a7779_devices_dt)); 354 ARRAY_SIZE(r8a7779_devices_dt));
355 platform_add_devices(r8a7779_early_devices, 355 platform_add_devices(r8a7779_late_devices,
356 ARRAY_SIZE(r8a7779_early_devices)); 356 ARRAY_SIZE(r8a7779_late_devices));
357} 357}
358 358
359/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */ 359/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
@@ -370,8 +370,6 @@ void __init r8a7779_add_early_devices(void)
370{ 370{
371 early_platform_add_devices(r8a7779_devices_dt, 371 early_platform_add_devices(r8a7779_devices_dt,
372 ARRAY_SIZE(r8a7779_devices_dt)); 372 ARRAY_SIZE(r8a7779_devices_dt));
373 early_platform_add_devices(r8a7779_early_devices,
374 ARRAY_SIZE(r8a7779_early_devices));
375 373
376 /* Early serial console setup is not included here due to 374 /* Early serial console setup is not included here due to
377 * memory map collisions. The SCIF serial ports in r8a7779 375 * memory map collisions. The SCIF serial ports in r8a7779