[U-Boot] [PATCHv2 2/2] armv8/fsl-lsch3: consolidate the clock system initialization

[Z.Q. Hou]

Hi Prabhakar,

> -----Original Message-----
> From: Prabhakar Kushwaha
> Sent: 2016年10月8日 11:18
> To: Z.Q. Hou <zhiqiang.hou at nxp.com>; york sun <york.sun at nxp.com>;
> u-boot at lists.denx.de; albert.u.boot at aribaud.net; Mingkai Hu
> <mingkai.hu at nxp.com>; Calvin Johnson <calvin.johnson at nxp.com>
> Subject: RE: [PATCHv2 2/2] armv8/fsl-lsch3: consolidate the clock system
> initialization
> 
> 
> > -----Original Message-----
> > From: Z.Q. Hou
> > Sent: Saturday, October 08, 2016 8:23 AM
> > To: york sun <york.sun at nxp.com>; u-boot at lists.denx.de;
> > albert.u.boot at aribaud.net; Mingkai Hu <mingkai.hu at nxp.com>; Prabhakar
> > Kushwaha <prabhakar.kushwaha at nxp.com>; Calvin Johnson
> > <calvin.johnson at nxp.com>
> > Subject: RE: [PATCHv2 2/2] armv8/fsl-lsch3: consolidate the clock
> > system initialization
> >
> > Hi York,
> >
> > Sorry for my delay response since the National Day holidays.
> >
> >
> > > -----Original Message-----
> > > From: york sun
> > > Sent: 2016年10月6日 0:20
> > > To: Z.Q. Hou <zhiqiang.hou at nxp.com>; u-boot at lists.denx.de;
> > > albert.u.boot at aribaud.net; Mingkai Hu <mingkai.hu at nxp.com>;
> > > Prabhakar Kushwaha <prabhakar.kushwaha at nxp.com>; Calvin Johnson
> > > <calvin.johnson at nxp.com>
> > > Subject: Re: [PATCHv2 2/2] armv8/fsl-lsch3: consolidate the clock
> > > system initialization
> > >
> > > On 09/26/2016 01:13 AM, Zhiqiang Hou wrote:
> > > > From: Hou Zhiqiang <Zhiqiang.Hou at nxp.com>
> > > >
> > > > This patch map the sys_info->freq_systembus to Platform PLL, and
> > > > implement the IPs' clock function individually.
> > > >
> > > > Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou at nxp.com>
> > > > ---
> > > > V2:
> > > >  - Generate the patch set base on the latest
> > > git://git.denx.de/u-boot-fsl-qoriq.git.
> > > >  - Add Platform clock and IPs' input clock divisors.
> > > >
> > > >  .../arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 31
> > > > ++++++++++++++++------
> > > > arch/arm/include/asm/arch-fsl-layerscape/config.h  |  8
> > > ++++++  .../include/asm/arch-fsl-layerscape/immap_lsch3.h  |  1 +
> > > >  include/configs/ls2080a_common.h                   |  2 +-
> > > >  4 files changed, 33 insertions(+), 9 deletions(-)
> > > >
> > > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
> > > > b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
> > > > index a9b12a4..afc8a31 100644
> > > > --- a/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
> > > > +++ b/arch/arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c
> > > > @@ -88,11 +88,10 @@ void get_sys_info(struct sys_info *sys_info)
> > > > #endif  #endif
> > > >
> > > > +	/* The freq_systembus is used to record frequency of platform
> > > > +PLL */
> > > >  	sys_info->freq_systembus *= (gur_in32(&gur->rcwsr[0]) >>
> > > >  			FSL_CHASSIS3_RCWSR0_SYS_PLL_RAT_SHIFT) &
> > > >  			FSL_CHASSIS3_RCWSR0_SYS_PLL_RAT_MASK;
> > > > -	/* Platform clock is half of platform PLL */
> > > > -	sys_info->freq_systembus /= 2;
> > > >  	sys_info->freq_ddrbus *= (gur_in32(&gur->rcwsr[0]) >>
> > > >  			FSL_CHASSIS3_RCWSR0_MEM_PLL_RAT_SHIFT) &
> > > >  			FSL_CHASSIS3_RCWSR0_MEM_PLL_RAT_MASK;
> > > > @@ -132,7 +131,8 @@ void get_sys_info(struct sys_info *sys_info)
> > > >  	ccr = ifc_in32(&ifc_regs.gregs->ifc_ccr);
> > > >  	ccr = ((ccr & IFC_CCR_CLK_DIV_MASK) >> IFC_CCR_CLK_DIV_SHIFT)
> +
> > > > 1;
> > > >
> > > > -	sys_info->freq_localbus = sys_info->freq_systembus / ccr;
> > > > +	sys_info->freq_localbus = sys_info->freq_systembus /
> > > > +					CONFIG_SYS_FSL_PCLK_DIV / ccr;
> > > >  #endif
> > > >  }
> > > >
> > >
> > > Zhiqiang and Prabhakar,
> > >
> > > Your patches collide with each other. Can you two work together to
> > > sort it out?
> > >
> > > http://patchwork.ozlabs.org/patch/666849/
> > >
> 
> Following are the patches
> 
> http://patchwork.ozlabs.org/patch/666844/
> http://patchwork.ozlabs.org/patch/666849/
> http://patchwork.ozlabs.org/patch/666848/
> http://patchwork.ozlabs.org/patch/677041/
> 
Nowadays, the CONFIG_* must be added to Kconfig files, when you will upgrade your patches to fix it, so I can rebase my patches against yours?

Thanks,
Zhiqiang