From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Walmsley Subject: [PATCH 14/28] omap2 clock: clean out old code from omap2_clksel_recalc() Date: Mon, 20 Aug 2007 03:54:01 -0600 Message-ID: <20070820095531.341060817@pwsan.com> References: <20070820095347.933473149@pwsan.com> Return-path: Content-Disposition: inline; filename=convert_clksel_recalc.patch List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-omap-open-source-bounces+gplao-linux-omap-open-source=gmane.org@linux.omap.com Errors-To: linux-omap-open-source-bounces+gplao-linux-omap-open-source=gmane.org@linux.omap.com To: linux-omap-open-source@linux.omap.com List-Id: linux-omap@vger.kernel.org Get rid of now-obsolete code in omap2_clksel_recalc(). Signed-off-by: Paul Walmsley --- arch/arm/mach-omap2/clock.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) Index: linux-omap/arch/arm/mach-omap2/clock.c Index: linux-omap/arch/arm/mach-omap2/clock.c =================================================================== --- linux-omap.orig/arch/arm/mach-omap2/clock.c +++ linux-omap/arch/arm/mach-omap2/clock.c @@ -8,6 +8,10 @@ * Cleaned up and modified to use omap shared clock framework by * Tony Lindgren * + * Copyright (C) 2007 Texas Instruments, Inc. + * Copyright (C) 2007 Nokia Corporation + * Paul Walmsley + * * Based on omap1 clock.c, Copyright (C) 2004 - 2005 Nokia corporation * Written by Tuukka Tikkanen * @@ -38,10 +42,6 @@ #undef DEBUG -/* CM_CLKSEL1_CORE.CLKSEL_VLYNQ options (2420) */ -#define CLKSEL_VLYNQ_96MHZ 0 -#define CLKSEL_VLYNQ_CORECLK_16 0x10 - /* CM_CLKEN_PLL.EN_{54,96}M_PLL options (24XX) */ #define EN_APLL_STOPPED 0 #define EN_APLL_LOCKED 3 @@ -420,19 +420,9 @@ static void omap2_dpll_recalc(struct clk */ static void omap2_clksel_recalc(struct clk * clk) { - u32 clksel1_core, div = 0; + u32 div = 0; - clksel1_core = cm_read_mod_reg(CORE_MOD, CM_CLKSEL1); - - if ((clk == &dss1_fck) && - (clksel1_core & OMAP24XX_CLKSEL_DSS1_MASK) == 0) { - div = 1; - } - - if ((clk == &vlynq_fck) && cpu_is_omap2420() && - (clksel1_core & OMAP2420_CLKSEL_VLYNQ_MASK) == CLKSEL_VLYNQ_96MHZ) { - div = 1; - } + pr_debug("clock: recalc'ing clksel clk %s\n", clk->name); div = omap2_clksel_get_divisor(clk); if (div == 0) @@ -442,6 +432,8 @@ static void omap2_clksel_recalc(struct c return; clk->rate = clk->parent->rate / div; + pr_debug("clock: new clock rate is %ld (div %d)\n", clk->rate, div); + if (unlikely(clk->flags & RATE_PROPAGATES)) propagate_rate(clk); } --