On Tue, Feb 02, 2016 at 12:46:14PM +0800, Wenyou Yang wrote: > Due to introducing the PMC_PLLICPR init function, use this > function to clean up the code. > > Signed-off-by: Wenyou Yang <wenyou.y...@atmel.com> > Tested-by: Heiko Schocher <h...@denx.de>
Reviewed-by: Andreas Bießmann <andreas.de...@googlemail.com> > --- > > Changes in v3: > - collect Tested-by from Heiko Schocher. > > Changes in v2: None > > board/atmel/sama5d3_xplained/sama5d3_xplained.c | 4 +--- > board/atmel/sama5d3xek/sama5d3xek.c | 4 +--- > board/atmel/sama5d4_xplained/sama5d4_xplained.c | 4 +--- > board/atmel/sama5d4ek/sama5d4ek.c | 4 +--- > 4 files changed, 4 insertions(+), 12 deletions(-) > > diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c > b/board/atmel/sama5d3_xplained/sama5d3_xplained.c > index d180b41..6532970 100644 > --- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c > +++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c > @@ -10,7 +10,6 @@ > #include <asm/io.h> > #include <asm/arch/sama5d3_smc.h> > #include <asm/arch/at91_common.h> > -#include <asm/arch/at91_pmc.h> > #include <asm/arch/at91_rstc.h> > #include <asm/arch/gpio.h> > #include <asm/arch/clk.h> > @@ -198,7 +197,6 @@ void mem_init(void) > > void at91_pmc_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > u32 tmp; > > tmp = AT91_PMC_PLLAR_29 | > @@ -207,7 +205,7 @@ void at91_pmc_init(void) > AT91_PMC_PLLXR_DIV(1); > at91_plla_init(tmp); > > - writel(0x3 << 8, &pmc->pllicpr); > + at91_pllicpr_init(AT91_PMC_IPLL_PLLA(0x3)); > > tmp = AT91_PMC_MCKR_MDIV_4 | > AT91_PMC_MCKR_CSS_PLLA; > diff --git a/board/atmel/sama5d3xek/sama5d3xek.c > b/board/atmel/sama5d3xek/sama5d3xek.c > index 777e57e..7a804e8 100644 > --- a/board/atmel/sama5d3xek/sama5d3xek.c > +++ b/board/atmel/sama5d3xek/sama5d3xek.c > @@ -10,7 +10,6 @@ > #include <asm/io.h> > #include <asm/arch/sama5d3_smc.h> > #include <asm/arch/at91_common.h> > -#include <asm/arch/at91_pmc.h> > #include <asm/arch/at91_rstc.h> > #include <asm/arch/gpio.h> > #include <asm/arch/clk.h> > @@ -457,7 +456,6 @@ void mem_init(void) > > void at91_pmc_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > u32 tmp; > > tmp = AT91_PMC_PLLAR_29 | > @@ -466,7 +464,7 @@ void at91_pmc_init(void) > AT91_PMC_PLLXR_DIV(1); > at91_plla_init(tmp); > > - writel(0x3 << 8, &pmc->pllicpr); > + at91_pllicpr_init(AT91_PMC_IPLL_PLLA(0x3)); > > tmp = AT91_PMC_MCKR_MDIV_4 | > AT91_PMC_MCKR_CSS_PLLA; > diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c > b/board/atmel/sama5d4_xplained/sama5d4_xplained.c > index e95310c..3fec662 100644 > --- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c > +++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c > @@ -8,7 +8,6 @@ > #include <common.h> > #include <asm/io.h> > #include <asm/arch/at91_common.h> > -#include <asm/arch/at91_pmc.h> > #include <asm/arch/at91_rstc.h> > #include <asm/arch/atmel_mpddrc.h> > #include <asm/arch/atmel_usba_udc.h> > @@ -397,7 +396,6 @@ void mem_init(void) > > void at91_pmc_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > u32 tmp; > > tmp = AT91_PMC_PLLAR_29 | > @@ -406,7 +404,7 @@ void at91_pmc_init(void) > AT91_PMC_PLLXR_DIV(1); > at91_plla_init(tmp); > > - writel(0x0 << 8, &pmc->pllicpr); > + at91_pllicpr_init(AT91_PMC_IPLL_PLLA(0x0)); > > tmp = AT91_PMC_MCKR_H32MXDIV | > AT91_PMC_MCKR_PLLADIV_2 | > diff --git a/board/atmel/sama5d4ek/sama5d4ek.c > b/board/atmel/sama5d4ek/sama5d4ek.c > index c92e2588..6ccbc64 100644 > --- a/board/atmel/sama5d4ek/sama5d4ek.c > +++ b/board/atmel/sama5d4ek/sama5d4ek.c > @@ -8,7 +8,6 @@ > #include <common.h> > #include <asm/io.h> > #include <asm/arch/at91_common.h> > -#include <asm/arch/at91_pmc.h> > #include <asm/arch/at91_rstc.h> > #include <asm/arch/atmel_mpddrc.h> > #include <asm/arch/atmel_usba_udc.h> > @@ -393,7 +392,6 @@ void mem_init(void) > > void at91_pmc_init(void) > { > - struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; > u32 tmp; > > tmp = AT91_PMC_PLLAR_29 | > @@ -402,7 +400,7 @@ void at91_pmc_init(void) > AT91_PMC_PLLXR_DIV(1); > at91_plla_init(tmp); > > - writel(0x0 << 8, &pmc->pllicpr); > + at91_pllicpr_init(AT91_PMC_IPLL_PLLA(0x0)); > > tmp = AT91_PMC_MCKR_H32MXDIV | > AT91_PMC_MCKR_PLLADIV_2 | _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot