diff options
| author | Russell King | 2010-01-16 17:27:28 +0100 |
|---|---|---|
| committer | Russell King | 2010-05-02 10:35:29 +0200 |
| commit | 39c0cb02db5b8fdfac76d506b7a008b70bc960e9 (patch) | |
| tree | 30e79dcadb5f6c26bba5fcf585cc309e240ff948 /arch/arm/mach-integrator/impd1.c | |
| parent | ARM: Integrator: convert to use register definitions (diff) | |
| download | kernel-qcow2-linux-39c0cb02db5b8fdfac76d506b7a008b70bc960e9.tar.gz kernel-qcow2-linux-39c0cb02db5b8fdfac76d506b7a008b70bc960e9.tar.xz kernel-qcow2-linux-39c0cb02db5b8fdfac76d506b7a008b70bc960e9.zip | |
ARM: ICST: merge common ICST VCO structures
The structures for the ICST307 and ICST525 VCO devices are
identical, so merge them together.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/impd1.c')
| -rw-r--r-- | arch/arm/mach-integrator/impd1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index 0058c937719e..dfb961b67afa 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c @@ -40,7 +40,7 @@ struct impd1_module { struct clk_lookup *clks[3]; }; -static const struct icst525_params impd1_vco_params = { +static const struct icst_params impd1_vco_params = { .ref = 24000, /* 24 MHz */ .vco_max = 200000, /* 200 MHz */ .vd_min = 12, @@ -49,7 +49,7 @@ static const struct icst525_params impd1_vco_params = { .rd_max = 120, }; -static void impd1_setvco(struct clk *clk, struct icst525_vco vco) +static void impd1_setvco(struct clk *clk, struct icst_vco vco) { struct impd1_module *impd1 = clk->data; int vconr = clk - impd1->vcos; |