OSDN Git Service

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)
commit4497b40ca8217fce9f33c9886f5a1b0408661e03
tree419523071d0276231db749fdbb41638c7661dbdb
parent9b663b34c94a78f39fa2c7a8271b1f828b546e16
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>
arch/arm/mach-imx/mach-imx6q.c