Message ID | 1449647855-1986-4-git-send-email-wenyou.yang@atmel.com |
---|---|
State | Accepted |
Commit | b55b596086292d1675a09ac77b59d51871ce4f46 |
Delegated to: | Andreas Bießmann |
Headers | show |
Hello Wenyou, Am 09.12.2015 um 08:57 schrieb Wenyou Yang: > Due to introducing the new UTMI PLL clock handle functions, > use these function to reduce the duplicated code. > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > --- > > Changes in v2: > - remain asm/io.h include. > > drivers/usb/host/ehci-atmel.c | 38 ++++---------------------------------- > drivers/usb/host/ohci-at91.c | 20 +++++++------------- > 2 files changed, 11 insertions(+), 47 deletions(-) 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@denx.de> bye, Heiko > > diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c > index a33fb49..1d7d280 100644 > --- a/drivers/usb/host/ehci-atmel.c > +++ b/drivers/usb/host/ehci-atmel.c > @@ -7,37 +7,18 @@ > */ > > #include <common.h> > -#include <watchdog.h> > #include <usb.h> > #include <asm/io.h> > -#include <asm/arch/hardware.h> > -#include <asm/arch/at91_pmc.h> > #include <asm/arch/clk.h> > > #include "ehci.h" > > -/* Enable UTMI PLL time out 500us > - * 10 times as datasheet specified > - */ > -#define EN_UPLL_TIMEOUT 500UL > - > int ehci_hcd_init(int index, enum usb_init_type init, > struct ehci_hccr **hccr, struct ehci_hcor **hcor) > { > - at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; > - ulong start_time, tmp_time; > - > - start_time = get_timer(0); > /* Enable UTMI PLL */ > - writel(AT91_PMC_UPLLEN | AT91_PMC_BIASEN, &pmc->uckr); > - while ((readl(&pmc->sr) & AT91_PMC_LOCKU) != AT91_PMC_LOCKU) { > - WATCHDOG_RESET(); > - tmp_time = get_timer(0); > - if ((tmp_time - start_time) > EN_UPLL_TIMEOUT) { > - printf("ERROR: failed to enable UPLL\n"); > - return -1; > - } > - } > + if (at91_upll_clk_enable()) > + return -1; > > /* Enable USB Host clock */ > at91_periph_clk_enable(ATMEL_ID_UHPHS); > @@ -51,23 +32,12 @@ int ehci_hcd_init(int index, enum usb_init_type init, > > int ehci_hcd_stop(int index) > { > - at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; > - ulong start_time, tmp_time; > - > /* Disable USB Host Clock */ > at91_periph_clk_disable(ATMEL_ID_UHPHS); > > - start_time = get_timer(0); > /* Disable UTMI PLL */ > - writel(readl(&pmc->uckr) & ~AT91_PMC_UPLLEN, &pmc->uckr); > - while ((readl(&pmc->sr) & AT91_PMC_LOCKU) == AT91_PMC_LOCKU) { > - WATCHDOG_RESET(); > - tmp_time = get_timer(0); > - if ((tmp_time - start_time) > EN_UPLL_TIMEOUT) { > - printf("ERROR: failed to stop UPLL\n"); > - return -1; > - } > - } > + if (at91_upll_clk_disable()) > + return -1; > > return 0; > } > diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c > index da85111..6ae6959 100644 > --- a/drivers/usb/host/ohci-at91.c > +++ b/drivers/usb/host/ohci-at91.c > @@ -24,17 +24,13 @@ int usb_cpu_init(void) > while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) > ; > #ifdef CONFIG_AT91SAM9N12 > - writel(AT91_PMC_USBS_USB_PLLB | AT91_PMC_USB_DIV_2, &pmc->usb); > + at91_usb_clk_init(AT91_PMC_USBS_USB_PLLB | AT91_PMC_USB_DIV_2); > #endif > #elif defined(CONFIG_USB_ATMEL_CLK_SEL_UPLL) > - /* Enable UPLL */ > - writel(readl(&pmc->uckr) | AT91_PMC_UPLLEN | AT91_PMC_BIASEN, > - &pmc->uckr); > - while ((readl(&pmc->sr) & AT91_PMC_LOCKU) != AT91_PMC_LOCKU) > - ; > + if (at91_upll_clk_enable()) > + return -1; > > - /* Select PLLA as input clock of OHCI */ > - writel(AT91_PMC_USBS_USB_UPLL | AT91_PMC_USBDIV_10, &pmc->usb); > + at91_usb_clk_init(AT91_PMC_USBS_USB_UPLL | AT91_PMC_USBDIV_10); > #endif > > at91_periph_clk_enable(ATMEL_ID_UHP); > @@ -60,17 +56,15 @@ int usb_cpu_stop(void) > > #ifdef CONFIG_USB_ATMEL_CLK_SEL_PLLB > #ifdef CONFIG_AT91SAM9N12 > - writel(0, &pmc->usb); > + at91_usb_clk_init(0); > #endif > /* Disable PLLB */ > writel(0, &pmc->pllbr); > while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != 0) > ; > #elif defined(CONFIG_USB_ATMEL_CLK_SEL_UPLL) > - /* Disable UPLL */ > - writel(readl(&pmc->uckr) & (~AT91_PMC_UPLLEN), &pmc->uckr); > - while ((readl(&pmc->sr) & AT91_PMC_LOCKU) == AT91_PMC_LOCKU) > - ; > + if (at91_upll_clk_disable()) > + return -1; > #endif > > return 0; >
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c index a33fb49..1d7d280 100644 --- a/drivers/usb/host/ehci-atmel.c +++ b/drivers/usb/host/ehci-atmel.c @@ -7,37 +7,18 @@ */ #include <common.h> -#include <watchdog.h> #include <usb.h> #include <asm/io.h> -#include <asm/arch/hardware.h> -#include <asm/arch/at91_pmc.h> #include <asm/arch/clk.h> #include "ehci.h" -/* Enable UTMI PLL time out 500us - * 10 times as datasheet specified - */ -#define EN_UPLL_TIMEOUT 500UL - int ehci_hcd_init(int index, enum usb_init_type init, struct ehci_hccr **hccr, struct ehci_hcor **hcor) { - at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; - ulong start_time, tmp_time; - - start_time = get_timer(0); /* Enable UTMI PLL */ - writel(AT91_PMC_UPLLEN | AT91_PMC_BIASEN, &pmc->uckr); - while ((readl(&pmc->sr) & AT91_PMC_LOCKU) != AT91_PMC_LOCKU) { - WATCHDOG_RESET(); - tmp_time = get_timer(0); - if ((tmp_time - start_time) > EN_UPLL_TIMEOUT) { - printf("ERROR: failed to enable UPLL\n"); - return -1; - } - } + if (at91_upll_clk_enable()) + return -1; /* Enable USB Host clock */ at91_periph_clk_enable(ATMEL_ID_UHPHS); @@ -51,23 +32,12 @@ int ehci_hcd_init(int index, enum usb_init_type init, int ehci_hcd_stop(int index) { - at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; - ulong start_time, tmp_time; - /* Disable USB Host Clock */ at91_periph_clk_disable(ATMEL_ID_UHPHS); - start_time = get_timer(0); /* Disable UTMI PLL */ - writel(readl(&pmc->uckr) & ~AT91_PMC_UPLLEN, &pmc->uckr); - while ((readl(&pmc->sr) & AT91_PMC_LOCKU) == AT91_PMC_LOCKU) { - WATCHDOG_RESET(); - tmp_time = get_timer(0); - if ((tmp_time - start_time) > EN_UPLL_TIMEOUT) { - printf("ERROR: failed to stop UPLL\n"); - return -1; - } - } + if (at91_upll_clk_disable()) + return -1; return 0; } diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index da85111..6ae6959 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -24,17 +24,13 @@ int usb_cpu_init(void) while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) ; #ifdef CONFIG_AT91SAM9N12 - writel(AT91_PMC_USBS_USB_PLLB | AT91_PMC_USB_DIV_2, &pmc->usb); + at91_usb_clk_init(AT91_PMC_USBS_USB_PLLB | AT91_PMC_USB_DIV_2); #endif #elif defined(CONFIG_USB_ATMEL_CLK_SEL_UPLL) - /* Enable UPLL */ - writel(readl(&pmc->uckr) | AT91_PMC_UPLLEN | AT91_PMC_BIASEN, - &pmc->uckr); - while ((readl(&pmc->sr) & AT91_PMC_LOCKU) != AT91_PMC_LOCKU) - ; + if (at91_upll_clk_enable()) + return -1; - /* Select PLLA as input clock of OHCI */ - writel(AT91_PMC_USBS_USB_UPLL | AT91_PMC_USBDIV_10, &pmc->usb); + at91_usb_clk_init(AT91_PMC_USBS_USB_UPLL | AT91_PMC_USBDIV_10); #endif at91_periph_clk_enable(ATMEL_ID_UHP); @@ -60,17 +56,15 @@ int usb_cpu_stop(void) #ifdef CONFIG_USB_ATMEL_CLK_SEL_PLLB #ifdef CONFIG_AT91SAM9N12 - writel(0, &pmc->usb); + at91_usb_clk_init(0); #endif /* Disable PLLB */ writel(0, &pmc->pllbr); while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != 0) ; #elif defined(CONFIG_USB_ATMEL_CLK_SEL_UPLL) - /* Disable UPLL */ - writel(readl(&pmc->uckr) & (~AT91_PMC_UPLLEN), &pmc->uckr); - while ((readl(&pmc->sr) & AT91_PMC_LOCKU) == AT91_PMC_LOCKU) - ; + if (at91_upll_clk_disable()) + return -1; #endif return 0;
Due to introducing the new UTMI PLL clock handle functions, use these function to reduce the duplicated code. Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> --- Changes in v2: - remain asm/io.h include. drivers/usb/host/ehci-atmel.c | 38 ++++---------------------------------- drivers/usb/host/ohci-at91.c | 20 +++++++------------- 2 files changed, 11 insertions(+), 47 deletions(-)