Message ID | 1454384133-27666-2-git-send-email-wenyou.yang@atmel.com |
---|---|
State | Superseded |
Delegated to: | Andreas Bießmann |
Headers | show |
Hello Wenyou, Am 02.02.2016 um 04:35 schrieb Wenyou Yang: > To avoid the duplicated code, add the PLLB handle functions. > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com> > --- > > Changes in v3: None > Changes in v2: None > > arch/arm/mach-at91/arm926ejs/clock.c | 38 +++++++++++++++++++++++++++++++++ > arch/arm/mach-at91/include/mach/clk.h | 2 ++ > 2 files changed, 40 insertions(+) Tested-by: Heiko Schocher <hs@denx.de> bye, Heiko > > diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c > index c8b5e10..c8d24ae 100644 > --- a/arch/arm/mach-at91/arm926ejs/clock.c > +++ b/arch/arm/mach-at91/arm926ejs/clock.c > @@ -18,6 +18,8 @@ > # error You need to define CONFIG_AT91FAMILY in your board config! > #endif > > +#define EN_PLLB_TIMEOUT 500 > + > DECLARE_GLOBAL_DATA_PTR; > > static unsigned long at91_css_to_rate(unsigned long css) > @@ -242,3 +244,39 @@ void at91_mck_init(u32 mckr) > while (!(readl(&pmc->sr) & AT91_PMC_MCKRDY)) > ; > } > + > +int at91_pllb_clk_enable(u32 pllbr) > +{ > + struct at91_pmc *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; > + ulong start_time, tmp_time; > + > + start_time = get_timer(0); > + writel(pllbr, &pmc->pllbr); > + while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) { > + tmp_time = get_timer(0); > + if ((tmp_time - start_time) > EN_PLLB_TIMEOUT) { > + printf("ERROR: failed to enable PLLB\n"); > + return -1; > + } > + } > + > + return 0; > +} > + > +int at91_pllb_clk_disable(void) > +{ > + struct at91_pmc *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; > + ulong start_time, tmp_time; > + > + start_time = get_timer(0); > + writel(0, &pmc->pllbr); > + while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != 0) { > + tmp_time = get_timer(0); > + if ((tmp_time - start_time) > EN_PLLB_TIMEOUT) { > + printf("ERROR: failed to disable PLLB\n"); > + return -1; > + } > + } > + > + return 0; > +} > diff --git a/arch/arm/mach-at91/include/mach/clk.h b/arch/arm/mach-at91/include/mach/clk.h > index b2604ef..64dec52 100644 > --- a/arch/arm/mach-at91/include/mach/clk.h > +++ b/arch/arm/mach-at91/include/mach/clk.h > @@ -133,5 +133,7 @@ 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); > +int at91_pllb_clk_enable(u32 pllbr); > +int at91_pllb_clk_disable(void); > > #endif /* __ASM_ARM_ARCH_CLK_H__ */ >
Hello Heiko, Thank you very much for your test. > -----Original Message----- > From: Heiko Schocher [mailto:hs@denx.de] > Sent: 2016年2月2日 13:33 > To: Yang, Wenyou <Wenyou.Yang@atmel.com> > Cc: U-Boot Mailing List <u-boot@lists.denx.de> > Subject: Re: [U-Boot] [PATCH v3 1/3] ARM: at91: clock: add PLLB enable/disable > functions > > Hello Wenyou, > > Am 02.02.2016 um 04:35 schrieb Wenyou Yang: > > To avoid the duplicated code, add the PLLB handle functions. > > > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > > Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com> > > --- > > > > Changes in v3: None > > Changes in v2: None > > > > arch/arm/mach-at91/arm926ejs/clock.c | 38 > +++++++++++++++++++++++++++++++++ > > arch/arm/mach-at91/include/mach/clk.h | 2 ++ > > 2 files changed, 40 insertions(+) > > Tested-by: Heiko Schocher <hs@denx.de> > > bye, > Heiko > > > > diff --git a/arch/arm/mach-at91/arm926ejs/clock.c > > b/arch/arm/mach-at91/arm926ejs/clock.c > > index c8b5e10..c8d24ae 100644 > > --- a/arch/arm/mach-at91/arm926ejs/clock.c > > +++ b/arch/arm/mach-at91/arm926ejs/clock.c > > @@ -18,6 +18,8 @@ > > # error You need to define CONFIG_AT91FAMILY in your board config! > > #endif > > > > +#define EN_PLLB_TIMEOUT 500 > > + > > DECLARE_GLOBAL_DATA_PTR; > > > > static unsigned long at91_css_to_rate(unsigned long css) @@ -242,3 > > +244,39 @@ void at91_mck_init(u32 mckr) > > while (!(readl(&pmc->sr) & AT91_PMC_MCKRDY)) > > ; > > } > > + > > +int at91_pllb_clk_enable(u32 pllbr) > > +{ > > + struct at91_pmc *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; > > + ulong start_time, tmp_time; > > + > > + start_time = get_timer(0); > > + writel(pllbr, &pmc->pllbr); > > + while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) { > > + tmp_time = get_timer(0); > > + if ((tmp_time - start_time) > EN_PLLB_TIMEOUT) { > > + printf("ERROR: failed to enable PLLB\n"); > > + return -1; > > + } > > + } > > + > > + return 0; > > +} > > + > > +int at91_pllb_clk_disable(void) > > +{ > > + struct at91_pmc *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; > > + ulong start_time, tmp_time; > > + > > + start_time = get_timer(0); > > + writel(0, &pmc->pllbr); > > + while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != 0) { > > + tmp_time = get_timer(0); > > + if ((tmp_time - start_time) > EN_PLLB_TIMEOUT) { > > + printf("ERROR: failed to disable PLLB\n"); > > + return -1; > > + } > > + } > > + > > + return 0; > > +} > > diff --git a/arch/arm/mach-at91/include/mach/clk.h > > b/arch/arm/mach-at91/include/mach/clk.h > > index b2604ef..64dec52 100644 > > --- a/arch/arm/mach-at91/include/mach/clk.h > > +++ b/arch/arm/mach-at91/include/mach/clk.h > > @@ -133,5 +133,7 @@ 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); > > +int at91_pllb_clk_enable(u32 pllbr); > > +int at91_pllb_clk_disable(void); > > > > #endif /* __ASM_ARM_ARCH_CLK_H__ */ > > > > -- > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Best Regards, Wenyou Yang
diff --git a/arch/arm/mach-at91/arm926ejs/clock.c b/arch/arm/mach-at91/arm926ejs/clock.c index c8b5e10..c8d24ae 100644 --- a/arch/arm/mach-at91/arm926ejs/clock.c +++ b/arch/arm/mach-at91/arm926ejs/clock.c @@ -18,6 +18,8 @@ # error You need to define CONFIG_AT91FAMILY in your board config! #endif +#define EN_PLLB_TIMEOUT 500 + DECLARE_GLOBAL_DATA_PTR; static unsigned long at91_css_to_rate(unsigned long css) @@ -242,3 +244,39 @@ void at91_mck_init(u32 mckr) while (!(readl(&pmc->sr) & AT91_PMC_MCKRDY)) ; } + +int at91_pllb_clk_enable(u32 pllbr) +{ + struct at91_pmc *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; + ulong start_time, tmp_time; + + start_time = get_timer(0); + writel(pllbr, &pmc->pllbr); + while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB) { + tmp_time = get_timer(0); + if ((tmp_time - start_time) > EN_PLLB_TIMEOUT) { + printf("ERROR: failed to enable PLLB\n"); + return -1; + } + } + + return 0; +} + +int at91_pllb_clk_disable(void) +{ + struct at91_pmc *pmc = (at91_pmc_t *)ATMEL_BASE_PMC; + ulong start_time, tmp_time; + + start_time = get_timer(0); + writel(0, &pmc->pllbr); + while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != 0) { + tmp_time = get_timer(0); + if ((tmp_time - start_time) > EN_PLLB_TIMEOUT) { + printf("ERROR: failed to disable PLLB\n"); + return -1; + } + } + + return 0; +} diff --git a/arch/arm/mach-at91/include/mach/clk.h b/arch/arm/mach-at91/include/mach/clk.h index b2604ef..64dec52 100644 --- a/arch/arm/mach-at91/include/mach/clk.h +++ b/arch/arm/mach-at91/include/mach/clk.h @@ -133,5 +133,7 @@ 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); +int at91_pllb_clk_enable(u32 pllbr); +int at91_pllb_clk_disable(void); #endif /* __ASM_ARM_ARCH_CLK_H__ */