Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753038Ab0ALHAO (ORCPT ); Tue, 12 Jan 2010 02:00:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751180Ab0ALG74 (ORCPT ); Tue, 12 Jan 2010 01:59:56 -0500 Received: from ozlabs.org ([203.10.76.45]:45455 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751183Ab0ALG6p (ORCPT ); Tue, 12 Jan 2010 01:58:45 -0500 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC,PATCH 4/7 v2] arm/versatile: remove oscoff from clk_versatile Message-Id: <1263279511.161599.615234274711.4.gpush@pororo> In-Reply-To: <1263279511.160127.576969496193.0.gpush@pororo> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org From: Jeremy Kerr Date: Tue, 12 Jan 2010 17:58:31 +1100 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1826 Lines: 55 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 d1c8791..6ac30c5 100644 --- a/arch/arm/mach-versatile/clock.h +++ b/arch/arm/mach-versatile/clock.h @@ -15,7 +15,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 b6964bc..2b670bb 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); } @@ -406,7 +407,6 @@ static struct clk_versatile osc4_clk = { .rd_min = 1 + 2, .rd_max = 127 + 2, }, - .oscoff = VERSATILE_SYS_OSCCLCD_OFFSET, .setvco = versatile_oscvco_set, }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/