Skip to content

Commit

Permalink
ARM: shmobile: r8a7779: Do not initialise i2c as an early device
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Simon Horman committed Mar 12, 2013
1 parent 916ddc3 commit e792120
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions arch/arm/mach-shmobile/setup-r8a7779.c
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ static struct platform_device *r8a7779_devices_dt[] __initdata = {
&tmu01_device,
};

static struct platform_device *r8a7779_early_devices[] __initdata = {
static struct platform_device *r8a7779_late_devices[] __initdata = {
&i2c0_device,
&i2c1_device,
&i2c2_device,
Expand All @@ -352,8 +352,8 @@ void __init r8a7779_add_standard_devices(void)

platform_add_devices(r8a7779_devices_dt,
ARRAY_SIZE(r8a7779_devices_dt));
platform_add_devices(r8a7779_early_devices,
ARRAY_SIZE(r8a7779_early_devices));
platform_add_devices(r8a7779_late_devices,
ARRAY_SIZE(r8a7779_late_devices));
}

/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
Expand All @@ -370,8 +370,6 @@ void __init r8a7779_add_early_devices(void)
{
early_platform_add_devices(r8a7779_devices_dt,
ARRAY_SIZE(r8a7779_devices_dt));
early_platform_add_devices(r8a7779_early_devices,
ARRAY_SIZE(r8a7779_early_devices));

/* Early serial console setup is not included here due to
* memory map collisions. The SCIF serial ports in r8a7779
Expand Down

0 comments on commit e792120

Please sign in to comment.