linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

powerpc, 8xx: Simplify brgclk calculation and remove get_brgclk()

Browse Source 
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>
This commit is contained in:
Christophe Leroy
2017-07-13 15:09:44 +02:00
committed by Tom Rini
parent b2f2c7be34
commit 7a0a550c7f
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
arch/powerpc/cpu/mpc8xx/speed.c
View File

@ -12,27 +12,6 @@
DECLARE_GLOBAL_DATA_PTR; 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 * 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 */ uint immr = get_immr(0); /* Return full IMMR contents */
immap_t __iomem *immap = (immap_t __iomem *)(immr & 0xFFFF0000); immap_t __iomem *immap = (immap_t __iomem *)(immr & 0xFFFF0000);
uint sccr = in_be32(&immap->im_clkrst.car_sccr); 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 * If for some reason measuring the gclk frequency won't
* work, we return the hardwired value. * work, we return the hardwired value.
@ -57,7 +38,7 @@ int get_clocks(void)
gd->bus_clk = gd->cpu_clk / 2; gd->bus_clk = gd->cpu_clk / 2;
} }
get_brgclk(sccr); gd->arch.brg_clk = gd->cpu_clk / divider;
return 0; return 0;
} }