Commit 4497b40c authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo

Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine"

This reverts commit cc8870bf.

Since commit cc8870bf ("ARM: imx6q: drop of_platform_default_populate()
from init_machine") the following errors are seen on boot:

[    0.123372] imx6q_suspend_init: failed to find ocram device!
[    0.123537] imx6_pm_common_init: No DDR LPM support with suspend -19!

, which break suspend/resume on imx6q/dl.

Revert the offeding commit to avoid the regression.

Thanks to Tim Harvey for bisecting this problem.

Cc: stable@vger.kernel.org
Fixes: cc8870bf ("ARM: imx6q: drop of_platform_default_populate() from  init_machine")
Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Acked-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 9b663b34
...@@ -172,6 +172,9 @@ static void __init imx6q_init_machine(void) ...@@ -172,6 +172,9 @@ static void __init imx6q_init_machine(void)
imx_get_soc_revision()); imx_get_soc_revision());
imx6q_enet_phy_init(); imx6q_enet_phy_init();
of_platform_default_populate(NULL, NULL, NULL);
imx_anatop_init(); imx_anatop_init();
cpu_is_imx6q() ? imx6q_pm_init() : imx6dl_pm_init(); cpu_is_imx6q() ? imx6q_pm_init() : imx6dl_pm_init();
imx6q_1588_init(); imx6q_1588_init();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment