Re: [PATCH] ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX

[Shawn Guo <shawnguo@kernel.org>]

On Thu, May 02, 2019 at 09:54:16AM -0300, Fabio Estevam wrote:
> On Thu, May 2, 2019 at 9:33 AM Fabio Estevam <festevam@gmail.com> wrote:
> >
> > On Thu, May 2, 2019 at 9:26 AM Sasha Levin <sashal@kernel.org> wrote:
> > >
> > > Hi,
> > >
> > > [This is an automated email]
> > >
> > > This commit has been processed because it contains a "Fixes:" tag,
> > > fixing commit: 1e434b703248 ARM: imx: update the cpu power up timing setting on i.mx6sx.
> > >
> > > The bot has tested the following trees: v5.0.10, v4.19.37, v4.14.114, v4.9.171, v4.4.179.
> > >
> > > v5.0.10: Build OK!
> > > v4.19.37: Build OK!
> > > v4.14.114: Build OK!
> > > v4.9.171: Build OK!
> > > v4.4.179: Failed to apply! Possible dependencies:
> > >     6ae44aa651d0 ("ARM: imx: enable WAIT mode hardware workaround for imx6sx")
> > >
> > >
> > > How should we proceed with this patch?
> >
> > I can submit a version for 4.4 stable tree once this hits mainline.
> > The conflict resolution is very simple.
> 
> Or maybe I can send a simpler version that applies all the way to 4.4:
> 
> --- a/arch/arm/mach-imx/cpuidle-imx6sx.c
> +++ b/arch/arm/mach-imx/cpuidle-imx6sx.c
> @@ -15,6 +15,7 @@
> 
>  #include "common.h"
>  #include "cpuidle.h"
> +#include "hardware.h"
> 
>  static int imx6sx_idle_finish(unsigned long val)
>  {
> @@ -110,7 +111,7 @@ int __init imx6sx_cpuidle_init(void)
>   * except for power up sw2iso which need to be
>   * larger than LDO ramp up time.
>   */
> - imx_gpc_set_arm_power_up_timing(0xf, 1);
> + imx_gpc_set_arm_power_up_timing(cpu_is_imx6sx() ? 0xf: 0x2, 1);
                                                         ^ missing space

>   imx_gpc_set_arm_power_down_timing(1, 1);
> 
>   return cpuidle_register(&imx6sx_cpuidle_driver, NULL);
> 
> Would this be preferred?

Yes, please.

Shawn