[U-Boot] [PATCH 2/3] drivers: usb: ohci-at91: clean up the PLLB code

[Andreas Bießmann]

Hi Wenyou,

On 09.12.2015 05:29, Wenyou Yang wrote:
> Due to introducing the new PLLB clock handle functions,
> use these functions to clean up the PLLB enable/disable code.
> 
> Signed-off-by: Wenyou Yang <wenyou.yang at atmel.com>
> ---
> 
>  drivers/usb/host/ohci-at91.c |   20 +++++---------------
>  1 file changed, 5 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> index 6ae6959..6431802 100644
> --- a/drivers/usb/host/ohci-at91.c
> +++ b/drivers/usb/host/ohci-at91.c
> @@ -9,20 +9,13 @@
>  
>  #if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
>  
> -#include <asm/io.h>
> -#include <asm/arch/hardware.h>
> -#include <asm/arch/at91_pmc.h>
>  #include <asm/arch/clk.h>
>  
>  int usb_cpu_init(void)
>  {
> -	at91_pmc_t *pmc	= (at91_pmc_t *)ATMEL_BASE_PMC;
> -
>  #ifdef CONFIG_USB_ATMEL_CLK_SEL_PLLB
> -	/* Enable PLLB */
> -	writel(get_pllb_init(), &pmc->pllbr);
> -	while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
> -		;
> +	at91_pllb_clk_enable(get_pllb_init());
> +

you introduced this function in 'ARM: at91: clock: add PLLB
enable/disable functions' with some timeout checking and respective
return value. Please respect this return value here and exit from
usb_cpu_init() on wrong PLLB setup.

>  #ifdef CONFIG_AT91SAM9N12
>  	at91_usb_clk_init(AT91_PMC_USBS_USB_PLLB | AT91_PMC_USB_DIV_2);
>  #endif
> @@ -45,8 +38,6 @@ int usb_cpu_init(void)
>  
>  int usb_cpu_stop(void)
>  {
> -	at91_pmc_t *pmc	= (at91_pmc_t *)ATMEL_BASE_PMC;
> -
>  	at91_periph_clk_disable(ATMEL_ID_UHP);
>  
>  	at91_system_clk_disable(ATMEL_PMC_UHP);
> @@ -58,10 +49,9 @@ int usb_cpu_stop(void)
>  #ifdef CONFIG_AT91SAM9N12
>  	at91_usb_clk_init(0);
>  #endif
> -	/* Disable PLLB */
> -	writel(0, &pmc->pllbr);
> -	while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != 0)
> -		;
> +
> +	at91_pllb_clk_disable();
> +

same for the disable function.

>  #elif defined(CONFIG_USB_ATMEL_CLK_SEL_UPLL)
>  	if (at91_upll_clk_disable())
>  		return -1;
> 

Andreas