| Message ID | 1511435934-24800-2-git-send-email-festevam@gmail.com |
|---|---|
| State | Accepted |
| Commit | b42287f4c92517022ab4e9a21ed27b9384c725cb |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot,1/2] mx6ull: Fix WDOG3 base address | expand |
> -----Original Message----- > From: Fabio Estevam [mailto:festevam@gmail.com] > Sent: Thursday, November 23, 2017 7:19 PM > To: sbabic@denx.de > Cc: u-boot@lists.denx.de; Ye Li <ye.li@nxp.com>; Peng Fan > <peng.fan@nxp.com>; Fabio Estevam <fabio.estevam@nxp.com> > Subject: [PATCH 2/2] imx: Also clear powerdown enable bit for WDOG3 on > i.MX6ULL > > From: Fabio Estevam <fabio.estevam@nxp.com> > > Clear powerdown enable bit for WDOG3 on i.MX6ULL to avoid unwanted > kernel reboots. > > Suggested-by: Ye Li <ye.li@nxp.com> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > arch/arm/mach-imx/init.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-imx/init.c b/arch/arm/mach-imx/init.c index > 720ad67..2a05c59 100644 > --- a/arch/arm/mach-imx/init.c > +++ b/arch/arm/mach-imx/init.c > @@ -78,7 +78,7 @@ void imx_set_wdog_powerdown(bool enable) > writew(enable, &wdog1->wmcr); > writew(enable, &wdog2->wmcr); > > - if (is_mx6sx() || is_mx6ul() || is_mx7()) > + if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx7()) > writew(enable, &wdog3->wmcr); > #ifdef CONFIG_MX7D > writew(enable, &wdog4->wmcr); Reviewed-by: Peng Fan <peng.fan@nxp.com> > -- > 2.7.4
On 23/11/2017 12:18, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > Clear powerdown enable bit for WDOG3 on i.MX6ULL to avoid unwanted > kernel reboots. > > Suggested-by: Ye Li <ye.li@nxp.com> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > arch/arm/mach-imx/init.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-imx/init.c b/arch/arm/mach-imx/init.c > index 720ad67..2a05c59 100644 > --- a/arch/arm/mach-imx/init.c > +++ b/arch/arm/mach-imx/init.c > @@ -78,7 +78,7 @@ void imx_set_wdog_powerdown(bool enable) > writew(enable, &wdog1->wmcr); > writew(enable, &wdog2->wmcr); > > - if (is_mx6sx() || is_mx6ul() || is_mx7()) > + if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx7()) > writew(enable, &wdog3->wmcr); > #ifdef CONFIG_MX7D > writew(enable, &wdog4->wmcr); > Reviewed-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 23/11/2017 12:18, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > Clear powerdown enable bit for WDOG3 on i.MX6ULL to avoid unwanted > kernel reboots. > > Suggested-by: Ye Li <ye.li@nxp.com> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > arch/arm/mach-imx/init.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-imx/init.c b/arch/arm/mach-imx/init.c > index 720ad67..2a05c59 100644 > --- a/arch/arm/mach-imx/init.c > +++ b/arch/arm/mach-imx/init.c > @@ -78,7 +78,7 @@ void imx_set_wdog_powerdown(bool enable) > writew(enable, &wdog1->wmcr); > writew(enable, &wdog2->wmcr); > > - if (is_mx6sx() || is_mx6ul() || is_mx7()) > + if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx7()) > writew(enable, &wdog3->wmcr); > #ifdef CONFIG_MX7D > writew(enable, &wdog4->wmcr); > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/mach-imx/init.c b/arch/arm/mach-imx/init.c index 720ad67..2a05c59 100644 --- a/arch/arm/mach-imx/init.c +++ b/arch/arm/mach-imx/init.c @@ -78,7 +78,7 @@ void imx_set_wdog_powerdown(bool enable) writew(enable, &wdog1->wmcr); writew(enable, &wdog2->wmcr); - if (is_mx6sx() || is_mx6ul() || is_mx7()) + if (is_mx6sx() || is_mx6ul() || is_mx6ull() || is_mx7()) writew(enable, &wdog3->wmcr); #ifdef CONFIG_MX7D writew(enable, &wdog4->wmcr);