ARM: ICST: indirect s2div and idx2s arrays via icst_params

[mv-sheeva.git] / arch / arm / common / icst307.c

diff --git a/arch/arm/common/icst307.c b/arch/arm/common/icst307.c
index 6d094c1575400d0487b754ecb6a723ee474435dd..8332c0726e731c16c9f17a1d01245e87509d8fa9 100644 (file)
--- a/arch/arm/common/icst307.c
+++ b/arch/arm/common/icst307.c
@@ -22,24 +22,28 @@
 /*
  * Divisors for each OD setting.
  */
-static unsigned char s2div[8] = { 10, 2, 8, 4, 5, 7, 3, 6 };
+const unsigned char icst307_s2div[8] = { 10, 2, 8, 4, 5, 7, 3, 6 };
 
-unsigned long icst307_khz(const struct icst307_params *p, struct icst307_vco vco)
+EXPORT_SYMBOL(icst307_s2div);
+
+unsigned long icst307_hz(const struct icst_params *p, struct icst_vco vco)
 {
-       return p->ref * 2 * (vco.v + 8) / ((vco.r + 2) * s2div[vco.s]);
+       return p->ref * 2 * (vco.v + 8) / ((vco.r + 2) * p->s2div[vco.s]);
 }
 
-EXPORT_SYMBOL(icst307_khz);
+EXPORT_SYMBOL(icst307_hz);
 
 /*
  * Ascending divisor S values.
  */
-static unsigned char idx2s[8] = { 1, 6, 3, 4, 7, 5, 2, 0 };
+const unsigned char icst307_idx2s[8] = { 1, 6, 3, 4, 7, 5, 2, 0 };
+
+EXPORT_SYMBOL(icst307_idx2s);
 
-struct icst307_vco
-icst307_khz_to_vco(const struct icst307_params *p, unsigned long freq)
+struct icst_vco
+icst307_hz_to_vco(const struct icst_params *p, unsigned long freq)
 {
-       struct icst307_vco vco = { .s = 1, .v = p->vd_max, .r = p->rd_max };
+       struct icst_vco vco = { .s = 1, .v = p->vd_max, .r = p->rd_max };
        unsigned long f;
        unsigned int i = 0, rd, best = (unsigned int)-1;
 
@@ -48,19 +52,19 @@ icst307_khz_to_vco(const struct icst307_params *p, unsigned long freq)
         * that the PLL output is within spec.
         */
        do {
-               f = freq * s2div[idx2s[i]];
+               f = freq * p->s2div[p->idx2s[i]];
 
                /*
                 * f must be between 6MHz and 200MHz (3.3 or 5V)
                 */
-               if (f > 6000 && f <= p->vco_max)
+               if (f > p->vco_min && f <= p->vco_max)
                        break;
-       } while (i < ARRAY_SIZE(idx2s));
+       } while (i < 8);
 
-       if (i >= ARRAY_SIZE(idx2s))
+       if (i >= 8)
                return vco;
 
-       vco.s = idx2s[i];
+       vco.s = p->idx2s[i];
 
        /*
         * Now find the closest divisor combination
@@ -94,68 +98,4 @@ icst307_khz_to_vco(const struct icst307_params *p, unsigned long freq)
        return vco;
 }
 
-EXPORT_SYMBOL(icst307_khz_to_vco);
-
-struct icst307_vco
-icst307_ps_to_vco(const struct icst307_params *p, unsigned long period)
-{
-       struct icst307_vco vco = { .s = 1, .v = p->vd_max, .r = p->rd_max };
-       unsigned long f, ps;
-       unsigned int i = 0, rd, best = (unsigned int)-1;
-
-       ps = 1000000000UL / p->vco_max;
-
-       /*
-        * First, find the PLL output divisor such
-        * that the PLL output is within spec.
-        */
-       do {
-               f = period / s2div[idx2s[i]];
-
-               /*
-                * f must be between 6MHz and 200MHz (3.3 or 5V)
-                */
-               if (f >= ps && f < 1000000000UL / 6000 + 1)
-                       break;
-       } while (i < ARRAY_SIZE(idx2s));
-
-       if (i >= ARRAY_SIZE(idx2s))
-               return vco;
-
-       vco.s = idx2s[i];
-
-       ps = 500000000UL / p->ref;
-
-       /*
-        * Now find the closest divisor combination
-        * which gives a PLL output of 'f'.
-        */
-       for (rd = p->rd_min; rd <= p->rd_max; rd++) {
-               unsigned long f_in_div, f_pll;
-               unsigned int vd;
-               int f_diff;
-
-               f_in_div = ps * rd;
-
-               vd = (f_in_div + f / 2) / f;
-               if (vd < p->vd_min || vd > p->vd_max)
-                       continue;
-
-               f_pll = (f_in_div + vd / 2) / vd;
-               f_diff = f_pll - f;
-               if (f_diff < 0)
-                       f_diff = -f_diff;
-
-               if ((unsigned)f_diff < best) {
-                       vco.v = vd - 8;
-                       vco.r = rd - 2;
-                       if (f_diff == 0)
-                               break;
-                       best = f_diff;
-               }
-       }
-
-       return vco;
-}
-
-EXPORT_SYMBOL(icst307_ps_to_vco);
+EXPORT_SYMBOL(icst307_hz_to_vco);