]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine"
authorFabio Estevam <festevam@gmail.com>
Mon, 20 Sep 2021 23:43:11 +0000 (20:43 -0300)
committerShawn Guo <shawnguo@kernel.org>
Wed, 22 Sep 2021 03:49:03 +0000 (11:49 +0800)
This reverts commit 38547f17ca311bf88119dd9b924c398417753d60.

Since commit 38547f17ca31 ("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: 38547f17ca31 ("ARM: imx6q: drop of_platform_default_populate() from init_machine")
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Acked-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/mach-imx/mach-imx6q.c

index 11dcc369ec14a3353d94504b10fa4c476124225c..c9d7c29d95e1e1eddf08196f7e42c34b7de496f4 100644 (file)
@@ -172,6 +172,9 @@ static void __init imx6q_init_machine(void)
                                imx_get_soc_revision());
 
        imx6q_enet_phy_init();
+
+       of_platform_default_populate(NULL, NULL, NULL);
+
        imx_anatop_init();
        cpu_is_imx6q() ?  imx6q_pm_init() : imx6dl_pm_init();
        imx6q_1588_init();