[PATCH] Revert "ARM: imx6q: drop of_platform_default_populate() from init_machine"

[Russell King (Oracle)]

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 at vger.kernel.org

Thanks Fabio.

Acked-by: Russell King (Oracle) <rmk+kernel at armlinux.org.uk>

> Fixes: cc8870bf4c3a ("ARM: imx6q: drop of_platform_default_populate() from  init_machine")
> Signed-off-by: Fabio Estevam <festevam at 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!