ARM: ICST: move minimum VCO frequency to icst_params

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/common/icst307.c b/arch/arm/common/icst307.c
index 66c69e597b70f81977e69d1edda2f340ed562f55..312485fab4a6f52cedd02679dea7ada77895176b 100644 (file)
--- a/arch/arm/common/icst307.c
+++ b/arch/arm/common/icst307.c
@@ -53,7 +53,7 @@ icst307_hz_to_vco(const struct icst_params *p, unsigned long freq)
                /*
                 * f must be between 6MHz and 200MHz (3.3 or 5V)
                 */
-               if (f > ICST307_VCO_MIN && f <= p->vco_max)
+               if (f > p->vco_min && f <= p->vco_max)
                        break;
        } while (i < ARRAY_SIZE(idx2s));
 

diff --git a/arch/arm/common/icst525.c b/arch/arm/common/icst525.c
index c1d22b7c4763d0a39b4fbc8011b1fa61e364060e..da58965da31135982bc95b2e3ee84eb4dc76c51f 100644 (file)
--- a/arch/arm/common/icst525.c
+++ b/arch/arm/common/icst525.c
@@ -51,7 +51,7 @@ icst525_hz_to_vco(const struct icst_params *p, unsigned long freq)
                 * f must be between 10MHz and
                 *  320MHz (5V) or 200MHz (3V)
                 */
-               if (f > ICST525_VCO_MIN && f <= p->vco_max)
+               if (f > p->vco_min && f <= p->vco_max)
                        break;
        } while (i < ARRAY_SIZE(idx2s));
 

diff --git a/arch/arm/include/asm/hardware/icst.h b/arch/arm/include/asm/hardware/icst.h
index 65b1edd4452b9e01d07886f400d4f66e2691bc17..6707c6a9132f5f36c07225f29db6ee87b3187b95 100644 (file)
--- a/arch/arm/include/asm/hardware/icst.h
+++ b/arch/arm/include/asm/hardware/icst.h
@@ -17,6 +17,7 @@
 struct icst_params {
        unsigned long   ref;
        unsigned long   vco_max;        /* inclusive */
+       unsigned long   vco_min;        /* exclusive */
        unsigned short  vd_min;         /* inclusive */
        unsigned short  vd_max;         /* inclusive */
        unsigned char   rd_min;         /* inclusive */

diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
index 3ebb785f30c1b90f1eb6ab47743005f75be4e3a8..569306b8fdb5e4802253bbfe9d700911f6df026d 100644 (file)
--- a/arch/arm/mach-integrator/cpu.c
+++ b/arch/arm/mach-integrator/cpu.c
@@ -34,6 +34,7 @@ static struct cpufreq_driver integrator_driver;
 static const struct icst_params lclk_params = {
        .ref            = 24000000,
        .vco_max        = ICST525_VCO_MAX_5V,
+       .vco_min        = ICST525_VCO_MIN,
        .vd_min         = 8,
        .vd_max         = 132,
        .rd_min         = 24,
@@ -43,6 +44,7 @@ static const struct icst_params lclk_params = {
 static const struct icst_params cclk_params = {
        .ref            = 24000000,
        .vco_max        = ICST525_VCO_MAX_5V,
+       .vco_min        = ICST525_VCO_MIN,
        .vd_min         = 12,
        .vd_max         = 160,
        .rd_min         = 24,

diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index ecce3eb8fe00685024806fb4129db5625d499f27..036cfb45273554a94da8a217ed29134d7e101c50 100644 (file)
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -43,6 +43,7 @@ struct impd1_module {
 static const struct icst_params impd1_vco_params = {
        .ref            = 24000000,     /* 24 MHz */
        .vco_max        = ICST525_VCO_MAX_3V,
+       .vco_min        = ICST525_VCO_MIN,
        .vd_min         = 12,
        .vd_max         = 519,
        .rd_min         = 3,

diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 335af99acb79d941bc03e358fdd8d363cbe03800..34c120ad12926922dfdc20425b7169bcd888e5a2 100644 (file)
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -271,6 +271,7 @@ static void __init intcp_init_irq(void)
 static const struct icst_params cp_auxvco_params = {
        .ref            = 24000000,
        .vco_max        = ICST525_VCO_MAX_5V,
+       .vco_min        = ICST525_VCO_MIN,
        .vd_min         = 8,
        .vd_max         = 263,
        .rd_min         = 3,

diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 02d48371c09b0435e6bff880152c23abfdeda03f..3ac44138bf755cf250e4b28563b4553202c2bfd0 100644 (file)
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -276,6 +276,7 @@ struct mmci_platform_data realview_mmc1_plat_data = {
 static const struct icst_params realview_oscvco_params = {
        .ref            = 24000000,
        .vco_max        = ICST307_VCO_MAX,
+       .vco_min        = ICST307_VCO_MIN,
        .vd_min         = 4 + 8,
        .vd_max         = 511 + 8,
        .rd_min         = 1 + 2,

diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index ff5d24f80b2993768f404ff9dc410c5fbdf9e26c..c4bf6802df5b159d010226b1e17dbe051ce93163 100644 (file)
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -382,6 +382,7 @@ static struct mmci_platform_data mmc0_plat_data = {
 static const struct icst_params versatile_oscvco_params = {
        .ref            = 24000000,
        .vco_max        = ICST307_VCO_MAX,
+       .vco_min        = ICST307_VCO_MIN,
        .vd_min         = 4 + 8,
        .vd_max         = 511 + 8,
        .rd_min         = 1 + 2,