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

[u-boot] / arch / powerpc / cpu / mpc8xx / speed.c

diff --git a/arch/powerpc/cpu/mpc8xx/speed.c b/arch/powerpc/cpu/mpc8xx/speed.c
index 8d43efff6ca1cc550ffe39aeff1dad03c2dc01aa..fa8f87cbc5ea2302437a8d4ef1835d7d2011eb9f 100644 (file)
--- 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;
 }