From mboxrd@z Thu Jan 1 00:00:00 1970 From: jeremy.kerr@canonical.com (Jeremy Kerr) Date: Fri, 08 Jan 2010 10:44:12 +1100 Subject: [RFC,PATCH 4/7] arm/versatile: remove oscoff from clk_versatile In-Reply-To: <1262907852.736281.78480196040.1.gpush@pororo> Message-ID: <1262907852.737430.115736300592.4.gpush@pororo> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org We only use one value for oscoff, so remove it from the struct. Signed-off-by: Jeremy Kerr --- arch/arm/mach-versatile/clock.h | 1 - arch/arm/mach-versatile/core.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-versatile/clock.h b/arch/arm/mach-versatile/clock.h index 8b0ec44..569a847 100644 --- a/arch/arm/mach-versatile/clock.h +++ b/arch/arm/mach-versatile/clock.h @@ -13,7 +13,6 @@ struct clk_versatile { struct clk clk; unsigned long rate; const struct icst307_params params; - u32 oscoff; void (*setvco)(struct clk_versatile *, struct icst307_vco); }; diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index fb66b20..df1bb4e 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -384,13 +384,14 @@ static void versatile_oscvco_set(struct clk_versatile *clk, struct icst307_vco v { void __iomem *sys = __io_address(VERSATILE_SYS_BASE); void __iomem *sys_lock = sys + VERSATILE_SYS_LOCK_OFFSET; + void __iomem *sys_osc = sys + VERSATILE_SYS_OSCCLCD_OFFSET; u32 val; - val = readl(sys + clk->oscoff) & ~0x7ffff; + val = readl(sys_osc) & ~0x7ffff; val |= vco.v | (vco.r << 9) | (vco.s << 16); writel(0xa05f, sys_lock); - writel(val, sys + clk->oscoff); + writel(val, sys_osc); writel(0, sys_lock); } @@ -408,7 +409,6 @@ static struct clk_versatile osc4_clk = { .rd_min = 1 + 2, .rd_max = 127 + 2, }, - .oscoff = VERSATILE_SYS_OSCCLCD_OFFSET, .setvco = versatile_oscvco_set, };