[U-Boot] [PATCH v2 1/4] ARM: at91: clock: add UTMI PLL enable/disable function

[Heiko Schocher]

Hello Wenyou,

Am 09.12.2015 um 08:57 schrieb Wenyou Yang:
> To avoid the duplicated code, add the UTMI PLL handle functions,
> and add PMC_USB init function too.
>
> Signed-off-by: Wenyou Yang <wenyou.yang at atmel.com>
> ---
>
> Changes in v2: None
>
>   arch/arm/mach-at91/clock.c            |   48 +++++++++++++++++++++++++++++++++
>   arch/arm/mach-at91/include/mach/clk.h |    3 +++
>   2 files changed, 51 insertions(+)

Tested on the smartweb board, see log:
http://xeidos.ddns.net/buildbot/builders/smartweb_dfu/builds/29/steps/shell/logs/tbotlog

Tested-by: Heiko Schocher <hs at denx.de>

bye,
Heiko
>
> diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
> index 823d218..b8f8d48 100644
> --- a/arch/arm/mach-at91/clock.c
> +++ b/arch/arm/mach-at91/clock.c
> @@ -10,6 +10,8 @@
>   #include <asm/arch/hardware.h>
>   #include <asm/arch/at91_pmc.h>
>
> +#define EN_UPLL_TIMEOUT		500
> +
>   void at91_periph_clk_enable(int id)
>   {
>   	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
> @@ -70,3 +72,49 @@ void at91_system_clk_disable(int sys_clk)
>
>   	writel(sys_clk, &pmc->scdr);
>   }
> +
> +int at91_upll_clk_enable(void)
> +{
> +	struct at91_pmc *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
> +	ulong start_time, tmp_time;
> +
> +	if ((readl(&pmc->uckr) & AT91_PMC_UPLLEN) == AT91_PMC_UPLLEN)
> +		return 0;
> +
> +	start_time = get_timer(0);
> +	writel(AT91_PMC_UPLLEN | AT91_PMC_BIASEN, &pmc->uckr);
> +	while ((readl(&pmc->sr) & AT91_PMC_LOCKU) != AT91_PMC_LOCKU) {
> +		tmp_time = get_timer(0);
> +		if ((tmp_time - start_time) > EN_UPLL_TIMEOUT) {
> +			printf("ERROR: failed to enable UPLL\n");
> +			return -1;
> +		}
> +	}
> +
> +	return 0;
> +}
> +
> +int at91_upll_clk_disable(void)
> +{
> +	struct at91_pmc *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
> +	ulong start_time, tmp_time;
> +
> +	start_time = get_timer(0);
> +	writel(readl(&pmc->uckr) & ~AT91_PMC_UPLLEN, &pmc->uckr);
> +	while ((readl(&pmc->sr) & AT91_PMC_LOCKU) == AT91_PMC_LOCKU) {
> +		tmp_time = get_timer(0);
> +		if ((tmp_time - start_time) > EN_UPLL_TIMEOUT) {
> +			printf("ERROR: failed to stop UPLL\n");
> +			return -1;
> +		}
> +	}
> +
> +	return 0;
> +}
> +
> +void at91_usb_clk_init(u32 value)
> +{
> +	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
> +
> +	writel(value, &pmc->usb);
> +}
> diff --git a/arch/arm/mach-at91/include/mach/clk.h b/arch/arm/mach-at91/include/mach/clk.h
> index bef4e1c..b2604ef 100644
> --- a/arch/arm/mach-at91/include/mach/clk.h
> +++ b/arch/arm/mach-at91/include/mach/clk.h
> @@ -130,5 +130,8 @@ int at91_enable_periph_generated_clk(u32 id, u32 clk_source, u32 div);
>   u32 at91_get_periph_generated_clk(u32 id);
>   void at91_system_clk_enable(int sys_clk);
>   void at91_system_clk_disable(int sys_clk);
> +int at91_upll_clk_enable(void);
> +int at91_upll_clk_disable(void);
> +void at91_usb_clk_init(u32 value);
>
>   #endif /* __ASM_ARM_ARCH_CLK_H__ */
>

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany