diff options
| author |   Fabio Estevam <festevam@gmail.com> | 2021-09-20 20:43:11 -0300 |
|---|---|---|
| committer |   Shawn Guo <shawnguo@kernel.org> | 2021-09-22 11:49:03 +0800 |
| commit | 4497b40ca8217fce9f33c9886f5a1b0408661e03 (patch) | |
| tree | 419523071d0276231db749fdbb41638c7661dbdb /arch/arm/mach-imx/mach-imx6q.c | |
| parent | ARM: dts: imx6dl-yapp4: Fix lp5562 LED driver probe (diff) | |
| download | linux-dev-4497b40ca8217fce9f33c9886f5a1b0408661e03.tar.xz linux-dev-4497b40ca8217fce9f33c9886f5a1b0408661e03.zip | |
Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine"
This reverts commit cc8870bf4c3ab0af385538460500a9d342ed945f.
Since commit cc8870bf4c3a ("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: cc8870bf4c3a ("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>
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6q.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 11dcc369ec14..c9d7c29d95e1 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -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(); |