From: Stefano Babic <sbabic@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 8/8] ARM: mx6: Allow enablement of FEC Anatop based clock for all MX6
Date: Thu, 19 Dec 2013 11:50:31 +0100 [thread overview]
Message-ID: <52B2CF77.4070207@denx.de> (raw)
In-Reply-To: <1387233845-4372-9-git-send-email-otavio@ossystems.com.br>
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
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
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
=====================================================================
next prev parent reply other threads:[~2013-12-19 10:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-16 22:43 [U-Boot] [PATCH v3 0/8] Pending patches for merging Otavio Salvador
2013-12-16 22:43 ` [U-Boot] [PATCH v3 1/8] wandboard: add Future Eletronics 7" WVGA LCD extension board Otavio Salvador
2013-12-19 10:36 ` Stefano Babic
2014-01-03 17:47 ` Otavio Salvador
2013-12-16 22:43 ` [U-Boot] [PATCH v3 2/8] mx6sabresd: Add eMMC specific environment to allow U-Boot update Otavio Salvador
2014-01-03 14:30 ` Stefano Babic
2014-01-03 14:48 ` Stefano Babic
2013-12-16 22:44 ` [U-Boot] [PATCH v3 3/8] imx: Easy enabling of SION per-pin using MUX_MODE_SION helper macro Otavio Salvador
2013-12-19 10:40 ` Stefano Babic
2014-01-03 14:30 ` Stefano Babic
2013-12-16 22:44 ` [U-Boot] [PATCH v3 4/8] mx28evk: Use 512k for fdt partition to align it Otavio Salvador
2013-12-19 10:41 ` Stefano Babic
2014-01-03 14:33 ` Stefano Babic
2013-12-16 22:44 ` [U-Boot] [PATCH v3 5/8] mx28evk: Add 'nandboot' environment command Otavio Salvador
2013-12-19 10:45 ` Stefano Babic
2013-12-19 11:02 ` Fabio Estevam
2014-01-03 14:33 ` Stefano Babic
2013-12-16 22:44 ` [U-Boot] [PATCH v3 6/8] mx28evk: Extend environment to easy write of NAND system Otavio Salvador
2014-01-03 14:34 ` Stefano Babic
2013-12-16 22:44 ` [U-Boot] [PATCH v3 7/8] ARM: mx6: Change the FDT loading address to avoid overlaping Otavio Salvador
2013-12-19 10:47 ` Stefano Babic
2014-01-03 14:34 ` Stefano Babic
2013-12-16 22:44 ` [U-Boot] [PATCH v3 8/8] ARM: mx6: Allow enablement of FEC Anatop based clock for all MX6 Otavio Salvador
2013-12-19 10:50 ` Stefano Babic [this message]
2014-01-03 14:35 ` Stefano Babic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52B2CF77.4070207@denx.de \
--to=sbabic@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox