summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hilman2012-06-28 19:01:31 +0200
committerTony Lindgren2012-07-02 13:58:47 +0200
commit95669d788192d351890bfb16785336c2db816356 (patch)
treece138b23ef7380c6acd1b84fe07a31d0337ee350
parentLinux 3.5-rc5 (diff)
downloadkernel-qcow2-linux-95669d788192d351890bfb16785336c2db816356.tar.gz
kernel-qcow2-linux-95669d788192d351890bfb16785336c2db816356.tar.xz
kernel-qcow2-linux-95669d788192d351890bfb16785336c2db816356.zip
ARM: OMAP2: Overo: init I2C before MMC to fix MMC suspend/resume failure
In order for suspend/resume dependencies to work correctly, I2C has to be initialized (more specifically, registered with the driver core) before MMC. Without this, the MMC driver fails to adjust the VMMC regulator (using i2c writes) during the suspend path. Problem found testing suspend/resume on 3730/OveroSTORM platform. Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/board-overo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 8fa2fc3a4c3c..779734d8ba37 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -494,8 +494,8 @@ static void __init overo_init(void)
regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
- omap_hsmmc_init(mmc);
overo_i2c_init();
+ omap_hsmmc_init(mmc);
omap_display_init(&overo_dss_data);
omap_serial_init();
omap_sdrc_init(mt46h32m32lf6_sdrc_params,