aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/common/icst307.c2
-rw-r--r--arch/arm/common/icst525.c2
-rw-r--r--arch/arm/include/asm/hardware/icst.h1
-rw-r--r--arch/arm/mach-integrator/cpu.c2
-rw-r--r--arch/arm/mach-integrator/impd1.c1
-rw-r--r--arch/arm/mach-integrator/integrator_cp.c1
-rw-r--r--arch/arm/mach-realview/core.c1
-rw-r--r--arch/arm/mach-versatile/core.c1
8 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/common/icst307.c b/arch/arm/common/icst307.c
index 66c69e597b70..312485fab4a6 100644
--- 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)
53 /* 53 /*
54 * f must be between 6MHz and 200MHz (3.3 or 5V) 54 * f must be between 6MHz and 200MHz (3.3 or 5V)
55 */ 55 */
56 if (f > ICST307_VCO_MIN && f <= p->vco_max) 56 if (f > p->vco_min && f <= p->vco_max)
57 break; 57 break;
58 } while (i < ARRAY_SIZE(idx2s)); 58 } while (i < ARRAY_SIZE(idx2s));
59 59
diff --git a/arch/arm/common/icst525.c b/arch/arm/common/icst525.c
index c1d22b7c4763..da58965da311 100644
--- 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)
51 * f must be between 10MHz and 51 * f must be between 10MHz and
52 * 320MHz (5V) or 200MHz (3V) 52 * 320MHz (5V) or 200MHz (3V)
53 */ 53 */
54 if (f > ICST525_VCO_MIN && f <= p->vco_max) 54 if (f > p->vco_min && f <= p->vco_max)
55 break; 55 break;
56 } while (i < ARRAY_SIZE(idx2s)); 56 } while (i < ARRAY_SIZE(idx2s));
57 57
diff --git a/arch/arm/include/asm/hardware/icst.h b/arch/arm/include/asm/hardware/icst.h
index 65b1edd4452b..6707c6a9132f 100644
--- a/arch/arm/include/asm/hardware/icst.h
+++ b/arch/arm/include/asm/hardware/icst.h
@@ -17,6 +17,7 @@
17struct icst_params { 17struct icst_params {
18 unsigned long ref; 18 unsigned long ref;
19 unsigned long vco_max; /* inclusive */ 19 unsigned long vco_max; /* inclusive */
20 unsigned long vco_min; /* exclusive */
20 unsigned short vd_min; /* inclusive */ 21 unsigned short vd_min; /* inclusive */
21 unsigned short vd_max; /* inclusive */ 22 unsigned short vd_max; /* inclusive */
22 unsigned char rd_min; /* inclusive */ 23 unsigned char rd_min; /* inclusive */
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
index 3ebb785f30c1..569306b8fdb5 100644
--- a/arch/arm/mach-integrator/cpu.c
+++ b/arch/arm/mach-integrator/cpu.c
@@ -34,6 +34,7 @@ static struct cpufreq_driver integrator_driver;
34static const struct icst_params lclk_params = { 34static const struct icst_params lclk_params = {
35 .ref = 24000000, 35 .ref = 24000000,
36 .vco_max = ICST525_VCO_MAX_5V, 36 .vco_max = ICST525_VCO_MAX_5V,
37 .vco_min = ICST525_VCO_MIN,
37 .vd_min = 8, 38 .vd_min = 8,
38 .vd_max = 132, 39 .vd_max = 132,
39 .rd_min = 24, 40 .rd_min = 24,
@@ -43,6 +44,7 @@ static const struct icst_params lclk_params = {
43static const struct icst_params cclk_params = { 44static const struct icst_params cclk_params = {
44 .ref = 24000000, 45 .ref = 24000000,
45 .vco_max = ICST525_VCO_MAX_5V, 46 .vco_max = ICST525_VCO_MAX_5V,
47 .vco_min = ICST525_VCO_MIN,
46 .vd_min = 12, 48 .vd_min = 12,
47 .vd_max = 160, 49 .vd_max = 160,
48 .rd_min = 24, 50 .rd_min = 24,
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index ecce3eb8fe00..036cfb452735 100644
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -43,6 +43,7 @@ struct impd1_module {
43static const struct icst_params impd1_vco_params = { 43static const struct icst_params impd1_vco_params = {
44 .ref = 24000000, /* 24 MHz */ 44 .ref = 24000000, /* 24 MHz */
45 .vco_max = ICST525_VCO_MAX_3V, 45 .vco_max = ICST525_VCO_MAX_3V,
46 .vco_min = ICST525_VCO_MIN,
46 .vd_min = 12, 47 .vd_min = 12,
47 .vd_max = 519, 48 .vd_max = 519,
48 .rd_min = 3, 49 .rd_min = 3,
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 335af99acb79..34c120ad1292 100644
--- 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)
271static const struct icst_params cp_auxvco_params = { 271static const struct icst_params cp_auxvco_params = {
272 .ref = 24000000, 272 .ref = 24000000,
273 .vco_max = ICST525_VCO_MAX_5V, 273 .vco_max = ICST525_VCO_MAX_5V,
274 .vco_min = ICST525_VCO_MIN,
274 .vd_min = 8, 275 .vd_min = 8,
275 .vd_max = 263, 276 .vd_max = 263,
276 .rd_min = 3, 277 .rd_min = 3,
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 02d48371c09b..3ac44138bf75 100644
--- 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 = {
276static const struct icst_params realview_oscvco_params = { 276static const struct icst_params realview_oscvco_params = {
277 .ref = 24000000, 277 .ref = 24000000,
278 .vco_max = ICST307_VCO_MAX, 278 .vco_max = ICST307_VCO_MAX,
279 .vco_min = ICST307_VCO_MIN,
279 .vd_min = 4 + 8, 280 .vd_min = 4 + 8,
280 .vd_max = 511 + 8, 281 .vd_max = 511 + 8,
281 .rd_min = 1 + 2, 282 .rd_min = 1 + 2,
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index ff5d24f80b29..c4bf6802df5b 100644
--- 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 = {
382static const struct icst_params versatile_oscvco_params = { 382static const struct icst_params versatile_oscvco_params = {
383 .ref = 24000000, 383 .ref = 24000000,
384 .vco_max = ICST307_VCO_MAX, 384 .vco_max = ICST307_VCO_MAX,
385 .vco_min = ICST307_VCO_MIN,
385 .vd_min = 4 + 8, 386 .vd_min = 4 + 8,
386 .vd_max = 511 + 8, 387 .vd_max = 511 + 8,
387 .rd_min = 1 + 2, 388 .rd_min = 1 + 2,
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-17 18:56:24 -0500