| Message ID | 1457513078-15919-1-git-send-email-van.freenix@gmail.com |
|---|---|
| State | Accepted |
| Commit | e4dc3fc0681bd205b1db6336b0ea3849b5c683e9 |
| Delegated to: | Stefano Babic |
| Headers | show |
Hi Stefano, Gentle Ping on the three patches. Thanks, Peng. On Wed, Mar 09, 2016 at 04:44:36PM +0800, Peng Fan wrote: >To i.MX6UL, default ARM rate and AHB rate is 396M and 198M, >no need to set them. > >Signed-off-by: Peng Fan <van.freenix@gmail.com> >Cc: Stefano Babic <sbabic@denx.de> >--- > arch/arm/cpu/armv7/mx6/soc.c | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > >diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c >index bdd41b0..f29901f 100644 >--- a/arch/arm/cpu/armv7/mx6/soc.c >+++ b/arch/arm/cpu/armv7/mx6/soc.c >@@ -328,13 +328,18 @@ int arch_cpu_init(void) > */ > init_bandgap(); > >- /* >- * When low freq boot is enabled, ROM will not set AHB >- * freq, so we need to ensure AHB freq is 132MHz in such >- * scenario. >- */ >- if (mxc_get_clock(MXC_ARM_CLK) == 396000000) >- set_ahb_rate(132000000); >+ if (!IS_ENABLED(CONFIG_MX6UL)) { >+ /* >+ * When low freq boot is enabled, ROM will not set AHB >+ * freq, so we need to ensure AHB freq is 132MHz in such >+ * scenario. >+ * >+ * To i.MX6UL, when power up, default ARM core and >+ * AHB rate is 396M and 132M. >+ */ >+ if (mxc_get_clock(MXC_ARM_CLK) == 396000000) >+ set_ahb_rate(132000000); >+ } > > /* Set perclk to source from OSC 24MHz */ > #if defined(CONFIG_MX6SL) >-- >2.6.2 >
On 25/03/2016 10:16, Peng Fan wrote: > Hi Stefano, > > Gentle Ping on the three patches. > > Thanks, > Peng. > On Wed, Mar 09, 2016 at 04:44:36PM +0800, Peng Fan wrote: >> To i.MX6UL, default ARM rate and AHB rate is 396M and 198M, >> no need to set them. >> >> Signed-off-by: Peng Fan <van.freenix@gmail.com> >> Cc: Stefano Babic <sbabic@denx.de> >> --- >> arch/arm/cpu/armv7/mx6/soc.c | 19 ++++++++++++------- >> 1 file changed, 12 insertions(+), 7 deletions(-) >> >> diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c >> index bdd41b0..f29901f 100644 >> --- a/arch/arm/cpu/armv7/mx6/soc.c >> +++ b/arch/arm/cpu/armv7/mx6/soc.c >> @@ -328,13 +328,18 @@ int arch_cpu_init(void) >> */ >> init_bandgap(); >> >> - /* >> - * When low freq boot is enabled, ROM will not set AHB >> - * freq, so we need to ensure AHB freq is 132MHz in such >> - * scenario. >> - */ >> - if (mxc_get_clock(MXC_ARM_CLK) == 396000000) >> - set_ahb_rate(132000000); >> + if (!IS_ENABLED(CONFIG_MX6UL)) { >> + /* >> + * When low freq boot is enabled, ROM will not set AHB >> + * freq, so we need to ensure AHB freq is 132MHz in such >> + * scenario. >> + * >> + * To i.MX6UL, when power up, default ARM core and >> + * AHB rate is 396M and 132M. >> + */ >> + if (mxc_get_clock(MXC_ARM_CLK) == 396000000) >> + set_ahb_rate(132000000); >> + } >> >> /* Set perclk to source from OSC 24MHz */ >> #if defined(CONFIG_MX6SL) >> -- >> 2.6.2 >> Appplied (whole series) to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index bdd41b0..f29901f 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -328,13 +328,18 @@ int arch_cpu_init(void) */ init_bandgap(); - /* - * When low freq boot is enabled, ROM will not set AHB - * freq, so we need to ensure AHB freq is 132MHz in such - * scenario. - */ - if (mxc_get_clock(MXC_ARM_CLK) == 396000000) - set_ahb_rate(132000000); + if (!IS_ENABLED(CONFIG_MX6UL)) { + /* + * When low freq boot is enabled, ROM will not set AHB + * freq, so we need to ensure AHB freq is 132MHz in such + * scenario. + * + * To i.MX6UL, when power up, default ARM core and + * AHB rate is 396M and 132M. + */ + if (mxc_get_clock(MXC_ARM_CLK) == 396000000) + set_ahb_rate(132000000); + } /* Set perclk to source from OSC 24MHz */ #if defined(CONFIG_MX6SL)
To i.MX6UL, default ARM rate and AHB rate is 396M and 198M, no need to set them. Signed-off-by: Peng Fan <van.freenix@gmail.com> Cc: Stefano Babic <sbabic@denx.de> --- arch/arm/cpu/armv7/mx6/soc.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)