| Message ID | 1387233845-4372-9-git-send-email-otavio@ossystems.com.br |
|---|---|
| State | Accepted |
| Delegated to: | Stefano Babic |
| Headers | show |
Hi Otavio, On 16/12/2013 23:44, Otavio Salvador wrote: > The enable_fec_anatop_clock method should be available for all MX6 > variant as it is not MX6 SoloLite specific. This moves the code out of > the #ifdef/#endif and we make it conditional to CONFIG_FEC_MXC > instead. > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > Changes in v3: > - new patch > > Changes in v2: None > > arch/arm/cpu/armv7/mx6/clock.c | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c > index 873d9d0..d87e73b 100644 > --- a/arch/arm/cpu/armv7/mx6/clock.c > +++ b/arch/arm/cpu/armv7/mx6/clock.c > @@ -310,7 +310,18 @@ static u32 get_mmdc_ch0_clk(void) > return freq / (podf + 1); > > } > +#else > +static u32 get_mmdc_ch0_clk(void) > +{ > + u32 cbcdr = __raw_readl(&imx_ccm->cbcdr); > + u32 mmdc_ch0_podf = (cbcdr & MXC_CCM_CBCDR_MMDC_CH0_PODF_MASK) >> > + MXC_CCM_CBCDR_MMDC_CH0_PODF_OFFSET; > + > + return get_periph_clk() / (mmdc_ch0_podf + 1); > +} > +#endif > > +#ifdef CONFIG_FEC_MXC > int enable_fec_anatop_clock(void) > { > u32 reg = 0; > @@ -339,16 +350,6 @@ int enable_fec_anatop_clock(void) > > return 0; > } > - > -#else > -static u32 get_mmdc_ch0_clk(void) > -{ > - u32 cbcdr = __raw_readl(&imx_ccm->cbcdr); > - u32 mmdc_ch0_podf = (cbcdr & MXC_CCM_CBCDR_MMDC_CH0_PODF_MASK) >> > - MXC_CCM_CBCDR_MMDC_CH0_PODF_OFFSET; > - > - return get_periph_clk() / (mmdc_ch0_podf + 1); > -} > #endif > > static u32 get_usdhc_clk(u32 port) > Acked-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
On 16/12/2013 23:44, Otavio Salvador wrote: > The enable_fec_anatop_clock method should be available for all MX6 > variant as it is not MX6 SoloLite specific. This moves the code out of > the #ifdef/#endif and we make it conditional to CONFIG_FEC_MXC > instead. > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index 873d9d0..d87e73b 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -310,7 +310,18 @@ static u32 get_mmdc_ch0_clk(void) return freq / (podf + 1); } +#else +static u32 get_mmdc_ch0_clk(void) +{ + u32 cbcdr = __raw_readl(&imx_ccm->cbcdr); + u32 mmdc_ch0_podf = (cbcdr & MXC_CCM_CBCDR_MMDC_CH0_PODF_MASK) >> + MXC_CCM_CBCDR_MMDC_CH0_PODF_OFFSET; + + return get_periph_clk() / (mmdc_ch0_podf + 1); +} +#endif +#ifdef CONFIG_FEC_MXC int enable_fec_anatop_clock(void) { u32 reg = 0; @@ -339,16 +350,6 @@ int enable_fec_anatop_clock(void) return 0; } - -#else -static u32 get_mmdc_ch0_clk(void) -{ - u32 cbcdr = __raw_readl(&imx_ccm->cbcdr); - u32 mmdc_ch0_podf = (cbcdr & MXC_CCM_CBCDR_MMDC_CH0_PODF_MASK) >> - MXC_CCM_CBCDR_MMDC_CH0_PODF_OFFSET; - - return get_periph_clk() / (mmdc_ch0_podf + 1); -} #endif static u32 get_usdhc_clk(u32 port)
The enable_fec_anatop_clock method should be available for all MX6 variant as it is not MX6 SoloLite specific. This moves the code out of the #ifdef/#endif and we make it conditional to CONFIG_FEC_MXC instead. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- Changes in v3: - new patch Changes in v2: None arch/arm/cpu/armv7/mx6/clock.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)