* [PATCH] Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine"
@ 2021-09-20 23:43 Fabio Estevam
2021-09-20 23:48 ` Russell King (Oracle)
2021-09-22 3:49 ` Shawn Guo
0 siblings, 2 replies; 3+ messages in thread
From: Fabio Estevam @ 2021-09-20 23:43 UTC (permalink / raw)
To: shawnguo
Cc: linux, linux-arm-kernel, m.felsch, tharvey, Fabio Estevam, stable
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>
---
arch/arm/mach-imx/mach-imx6q.c | 3 +++
1 file changed, 3 insertions(+)
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();
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine"
2021-09-20 23:43 [PATCH] Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine" Fabio Estevam
@ 2021-09-20 23:48 ` Russell King (Oracle)
2021-09-22 3:49 ` Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Russell King (Oracle) @ 2021-09-20 23:48 UTC (permalink / raw)
To: Fabio Estevam; +Cc: shawnguo, linux-arm-kernel, m.felsch, tharvey, stable
On Mon, Sep 20, 2021 at 08:43:11PM -0300, Fabio Estevam wrote:
> 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
Thanks Fabio.
Acked-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
> Fixes: cc8870bf4c3a ("ARM: imx6q: drop of_platform_default_populate() from init_machine")
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> ---
> arch/arm/mach-imx/mach-imx6q.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> 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();
> --
> 2.25.1
>
>
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine"
2021-09-20 23:43 [PATCH] Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine" Fabio Estevam
2021-09-20 23:48 ` Russell King (Oracle)
@ 2021-09-22 3:49 ` Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2021-09-22 3:49 UTC (permalink / raw)
To: Fabio Estevam; +Cc: linux, linux-arm-kernel, m.felsch, tharvey, stable
On Mon, Sep 20, 2021 at 08:43:11PM -0300, Fabio Estevam wrote:
> 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>
Applied, thanks!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-22 3:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-20 23:43 [PATCH] Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine" Fabio Estevam
2021-09-20 23:48 ` Russell King (Oracle)
2021-09-22 3:49 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).