diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-16 14:46:19 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-02 04:35:32 -0400 |
commit | 232eaf7f268f765b52170bec42bfa0c5825aa239 (patch) | |
tree | 972eb80dcb7d3b0d8ee10f83f307f1bc47b784a9 /arch/arm/mach-integrator | |
parent | e73a46a3d3df22b379d8adcb59999eafea1d60d5 (diff) |
ARM: ICST: indirect s2div and idx2s arrays via icst_params
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r-- | arch/arm/mach-integrator/cpu.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-integrator/impd1.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c index 569306b8fdb5..9481c5408bf8 100644 --- a/arch/arm/mach-integrator/cpu.c +++ b/arch/arm/mach-integrator/cpu.c | |||
@@ -39,6 +39,8 @@ static const struct icst_params lclk_params = { | |||
39 | .vd_max = 132, | 39 | .vd_max = 132, |
40 | .rd_min = 24, | 40 | .rd_min = 24, |
41 | .rd_max = 24, | 41 | .rd_max = 24, |
42 | .s2div = icst525_s2div, | ||
43 | .idx2s = icst525_idx2s, | ||
42 | }; | 44 | }; |
43 | 45 | ||
44 | static const struct icst_params cclk_params = { | 46 | static const struct icst_params cclk_params = { |
@@ -49,6 +51,8 @@ static const struct icst_params cclk_params = { | |||
49 | .vd_max = 160, | 51 | .vd_max = 160, |
50 | .rd_min = 24, | 52 | .rd_min = 24, |
51 | .rd_max = 24, | 53 | .rd_max = 24, |
54 | .s2div = icst525_s2div, | ||
55 | .idx2s = icst525_idx2s, | ||
52 | }; | 56 | }; |
53 | 57 | ||
54 | /* | 58 | /* |
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index 036cfb452735..e24cfc357ffb 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c | |||
@@ -48,6 +48,8 @@ static const struct icst_params impd1_vco_params = { | |||
48 | .vd_max = 519, | 48 | .vd_max = 519, |
49 | .rd_min = 3, | 49 | .rd_min = 3, |
50 | .rd_max = 120, | 50 | .rd_max = 120, |
51 | .s2div = icst525_s2div, | ||
52 | .idx2s = icst525_idx2s, | ||
51 | }; | 53 | }; |
52 | 54 | ||
53 | static void impd1_setvco(struct clk *clk, struct icst_vco vco) | 55 | static void impd1_setvco(struct clk *clk, struct icst_vco vco) |
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 34c120ad1292..9997d1f6c184 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -276,6 +276,8 @@ static const struct icst_params cp_auxvco_params = { | |||
276 | .vd_max = 263, | 276 | .vd_max = 263, |
277 | .rd_min = 3, | 277 | .rd_min = 3, |
278 | .rd_max = 65, | 278 | .rd_max = 65, |
279 | .s2div = icst525_s2div, | ||
280 | .idx2s = icst525_idx2s, | ||
279 | }; | 281 | }; |
280 | 282 | ||
281 | static void cp_auxvco_set(struct clk *clk, struct icst_vco vco) | 283 | static void cp_auxvco_set(struct clk *clk, struct icst_vco vco) |