diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2017-07-13 15:09:44 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-22 22:22:47 -0400 |
| commit | 7a0a550c7f0cc1ca1e510c47c45e474122789bd6 (patch) | |
| tree | 8d378511c850861725f80b68c4637de7e7890457 /arch | |
| parent | b2f2c7be3429ad4dc9b242b85a7e87e0ded0487a (diff) | |
| download | u-boot-7a0a550c7f0cc1ca1e510c47c45e474122789bd6.tar.gz u-boot-7a0a550c7f0cc1ca1e510c47c45e474122789bd6.tar.xz u-boot-7a0a550c7f0cc1ca1e510c47c45e474122789bd6.zip | |
powerpc, 8xx: Simplify brgclk calculation and remove get_brgclk()
divider is calculated based on SCCR_DFBRG, with:
SCCR_DFBRG 00 => divider 1 = 1 << 0
SCCR_DFBRG 01 => divider 4 = 1 << 2
SCCR_DFBRG 10 => divider 16 = 1 << 4
SCCR_DFBRG 11 => divider 64 = 1 << 6
This can be easily converted to a single shift operation:
divider = 1 << (SCCR_DFBRG * 2)
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/speed.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c index 8d43efff6c..fa8f87cbc5 100644 --- a/arch/powerpc/cpu/mpc8xx/speed.c +++ b/arch/powerpc/cpu/mpc8xx/speed.c @@ -12,27 +12,6 @@ DECLARE_GLOBAL_DATA_PTR; -void get_brgclk(uint sccr) -{ - uint divider = 0; - - switch ((sccr & SCCR_DFBRG11) >> 11) { - case 0: - divider = 1; - break; - case 1: - divider = 4; - break; - case 2: - divider = 16; - break; - case 3: - divider = 64; - break; - } - gd->arch.brg_clk = gd->cpu_clk / divider; -} - /* * get_clocks() fills in gd->cpu_clock depending on CONFIG_8xx_GCLK_FREQ */ @@ -41,6 +20,8 @@ int get_clocks(void) uint immr = get_immr(0); /* Return full IMMR contents */ immap_t __iomem *immap = (immap_t __iomem *)(immr & 0xFFFF0000); uint sccr = in_be32(&immap->im_clkrst.car_sccr); + uint divider = 1 << (((sccr & SCCR_DFBRG11) >> 11) * 2); + /* * If for some reason measuring the gclk frequency won't * work, we return the hardwired value. @@ -57,7 +38,7 @@ int get_clocks(void) gd->bus_clk = gd->cpu_clk / 2; } - get_brgclk(sccr); + gd->arch.brg_clk = gd->cpu_clk / divider; return 0; } |