From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Sun, 02 Aug 2015 11:17:22 +0200 Subject: [U-Boot] [PATCH v3 09/15] imx: mx6ul update soc related settings In-Reply-To: <1437391715-1344-10-git-send-email-Peng.Fan@freescale.com> References: <1437391715-1344-1-git-send-email-Peng.Fan@freescale.com> <1437391715-1344-10-git-send-email-Peng.Fan@freescale.com> Message-ID: <55BDE022.9080407@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 20/07/2015 13:28, Peng Fan wrote: > 1.Update WDOG settings. > 2.No need to gate/ungate all PFDs for i.MX6UL. > > Signed-off-by: Peng Fan > Signed-off-by: Ye.Li > --- > > Changes v3: > none > > Changes v2: > runtime check for wdog part. > > arch/arm/cpu/armv7/mx6/soc.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c > index e80c09c..033f9de 100644 > --- a/arch/arm/cpu/armv7/mx6/soc.c > +++ b/arch/arm/cpu/armv7/mx6/soc.c > @@ -316,11 +316,10 @@ static void imx_set_wdog_powerdown(bool enable) > { > struct wdog_regs *wdog1 = (struct wdog_regs *)WDOG1_BASE_ADDR; > struct wdog_regs *wdog2 = (struct wdog_regs *)WDOG2_BASE_ADDR; > - > -#ifdef CONFIG_MX6SX > struct wdog_regs *wdog3 = (struct wdog_regs *)WDOG3_BASE_ADDR; > - writew(enable, &wdog3->wmcr); > -#endif > + > + if (is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL)) > + writew(enable, &wdog3->wmcr); > > /* Write to the PDE (Power Down Enable) bit */ > writew(enable, &wdog1->wmcr); > @@ -530,7 +529,7 @@ void s_init(void) > u32 mask528; > u32 reg, periph1, periph2; > > - if (is_cpu_type(MXC_CPU_MX6SX)) > + if (is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL)) > return; > > /* Due to hardware limitation, on MX6Q we need to gate/ungate all PFDs > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================