This is a note to let you know that I've just added the patch titled
Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine"
to the 5.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-arm-imx6q-drop-of_platform_default_populate-from-init_machine.patch
and it can be found in the queue-5.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4497b40ca8217fce9f33c9886f5a1b0408661e03 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <festevam@xxxxxxxxx>
Date: Mon, 20 Sep 2021 20:43:11 -0300
Subject: Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine"
From: Fabio Estevam <festevam@xxxxxxxxx>
commit 4497b40ca8217fce9f33c9886f5a1b0408661e03 upstream.
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@xxxxxxxxxxxxxxx
Fixes: cc8870bf4c3a ("ARM: imx6q: drop of_platform_default_populate() from init_machine")
Signed-off-by: Fabio Estevam <festevam@xxxxxxxxx>
Acked-by: Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx>
Signed-off-by: Shawn Guo <shawnguo@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm/mach-imx/mach-imx6q.c | 3 +++
1 file changed, 3 insertions(+)
--- 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(vo
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();
Patches currently in stable-queue which might be from festevam@xxxxxxxxx are
queue-5.14/revert-arm-imx6q-drop-of_platform_default_populate-from-init_machine.patch
