lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: ICST: provide definitions for max/min VCO frequencies

Browse Source 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2010-01-16 18:08:47 +00:00
parent 643761ac43
commit 4de2edbd15
9 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/common/icst307.c
View File

@@ -53,7 +53,7 @@ icst307_khz_to_vco(const struct icst_params *p, unsigned long freq)
/* /*
* f must be between 6MHz and 200MHz (3.3 or 5V) * f must be between 6MHz and 200MHz (3.3 or 5V)
*/ */
if (f > 6000 && f <= p->vco_max) if (f > ICST307_VCO_MIN && f <= p->vco_max)
break; break;
} while (i < ARRAY_SIZE(idx2s)); } while (i < ARRAY_SIZE(idx2s));

2
arch/arm/common/icst525.c
View File

@@ -51,7 +51,7 @@ icst525_khz_to_vco(const struct icst_params *p, unsigned long freq)
* f must be between 10MHz and * f must be between 10MHz and
* 320MHz (5V) or 200MHz (3V) * 320MHz (5V) or 200MHz (3V)
*/ */
if (f > 10000 && f <= p->vco_max) if (f > ICST525_VCO_MIN && f <= p->vco_max)
break; break;
} while (i < ARRAY_SIZE(idx2s)); } while (i < ARRAY_SIZE(idx2s));

7
arch/arm/include/asm/hardware/icst307.h
View File

@@ -21,4 +21,11 @@
unsigned long icst307_khz(const struct icst_params *p, struct icst_vco vco); unsigned long icst307_khz(const struct icst_params *p, struct icst_vco vco);
struct icst_vco icst307_khz_to_vco(const struct icst_params *p, unsigned long freq); struct icst_vco icst307_khz_to_vco(const struct icst_params *p, unsigned long freq);
/*
* ICST307 VCO frequency must be between 6MHz and 200MHz (3.3 or 5V).
* This frequency is pre-output divider.
*/
#define ICST307_VCO_MIN 6000
#define ICST307_VCO_MAX 200000
#endif #endif

8
arch/arm/include/asm/hardware/icst525.h
View File

@@ -19,4 +19,12 @@
unsigned long icst525_khz(const struct icst_params *p, struct icst_vco vco); unsigned long icst525_khz(const struct icst_params *p, struct icst_vco vco);
struct icst_vco icst525_khz_to_vco(const struct icst_params *p, unsigned long freq); struct icst_vco icst525_khz_to_vco(const struct icst_params *p, unsigned long freq);
/*
* ICST525 VCO frequency must be between 10MHz and 200MHz (3V) or 320MHz (5V).
* This frequency is pre-output divider.
*/
#define ICST525_VCO_MIN 10000
#define ICST525_VCO_MAX_3V 200000
#define ICST525_VCO_MAX_5V 320000
#endif #endif

4
arch/arm/mach-integrator/cpu.c
View File

@@ -33,7 +33,7 @@ static struct cpufreq_driver integrator_driver;
static const struct icst_params lclk_params = { static const struct icst_params lclk_params = {
.ref = 24000, .ref = 24000,
.vco_max = 320000, .vco_max = ICST525_VCO_MAX_5V,
.vd_min = 8, .vd_min = 8,
.vd_max = 132, .vd_max = 132,
.rd_min = 24, .rd_min = 24,
@@ -42,7 +42,7 @@ static const struct icst_params lclk_params = {
static const struct icst_params cclk_params = { static const struct icst_params cclk_params = {
.ref = 24000, .ref = 24000,
.vco_max = 320000, .vco_max = ICST525_VCO_MAX_5V,
.vd_min = 12, .vd_min = 12,
.vd_max = 160, .vd_max = 160,
.rd_min = 24, .rd_min = 24,

2
arch/arm/mach-integrator/impd1.c
View File

@@ -42,7 +42,7 @@ struct impd1_module {
static const struct icst_params impd1_vco_params = { static const struct icst_params impd1_vco_params = {
.ref = 24000, /* 24 MHz */ .ref = 24000, /* 24 MHz */
.vco_max = 200000, /* 200 MHz */ .vco_max = ICST525_VCO_MAX_3V,
.vd_min = 12, .vd_min = 12,
.vd_max = 519, .vd_max = 519,
.rd_min = 3, .rd_min = 3,

2
arch/arm/mach-integrator/integrator_cp.c
View File

@@ -270,7 +270,7 @@ static void __init intcp_init_irq(void)
static const struct icst_params cp_auxvco_params = { static const struct icst_params cp_auxvco_params = {
.ref = 24000, .ref = 24000,
.vco_max = 320000, .vco_max = ICST525_VCO_MAX_5V,
.vd_min = 8, .vd_min = 8,
.vd_max = 263, .vd_max = 263,
.rd_min = 3, .rd_min = 3,

2
arch/arm/mach-realview/core.c
View File

@@ -275,7 +275,7 @@ struct mmci_platform_data realview_mmc1_plat_data = {
*/ */
static const struct icst_params realview_oscvco_params = { static const struct icst_params realview_oscvco_params = {
.ref = 24000, .ref = 24000,
.vco_max = 200000, .vco_max = ICST307_VCO_MAX,
.vd_min = 4 + 8, .vd_min = 4 + 8,
.vd_max = 511 + 8, .vd_max = 511 + 8,
.rd_min = 1 + 2, .rd_min = 1 + 2,

2
arch/arm/mach-versatile/core.c
View File

@@ -381,7 +381,7 @@ static struct mmci_platform_data mmc0_plat_data = {
*/ */
static const struct icst_params versatile_oscvco_params = { static const struct icst_params versatile_oscvco_params = {
.ref = 24000, .ref = 24000,
.vco_max = 200000, .vco_max = ICST307_VCO_MAX,
.vd_min = 4 + 8, .vd_min = 4 + 8,
.vd_max = 511 + 8, .vd_max = 511 + 8,
.rd_min = 1 + 2, .rd_min = 1 + 2,