From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Walmsley Subject: [PATCH 13/27] omap2 clock: stop using clk->src_offset in omap2_clk_set_parent() Date: Mon, 27 Aug 2007 02:39:09 -0600 Message-ID: <20070827084123.372541713@pwsan.com> References: <20070827083856.549249288@pwsan.com> Return-path: Content-Disposition: inline; filename=convert_set_parent.patch List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-omap-open-source-bounces@linux.omap.com Errors-To: linux-omap-open-source-bounces@linux.omap.com To: linux-omap-open-source@linux.omap.com List-Id: linux-omap@vger.kernel.org Stop using clk->src_offset in omap2_clk_set_parent(); use what we get from the clksel code instead. Signed-off-by: Paul Walmsley --- arch/arm/mach-omap2/clock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: linux-omap/arch/arm/mach-omap2/clock.c =================================================================== --- linux-omap.orig/arch/arm/mach-omap2/clock.c 2007-08-27 02:19:37.000000000 -0600 +++ linux-omap/arch/arm/mach-omap2/clock.c 2007-08-27 02:19:37.000000000 -0600 @@ -885,7 +885,7 @@ /* Set new source value (previous dividers if any in effect) */ reg_val = __raw_readl(src_addr) & ~field_mask; - reg_val |= (field_val << clk->src_offset); + reg_val |= (field_val << mask_to_shift(field_mask)); __raw_writel(reg_val, src_addr); wmb(); @@ -906,6 +906,9 @@ if (parent_div > 0) clk->rate /= parent_div; + pr_debug("clock: set parent of %s to %s (new rate %ld)\n", + clk->name, clk->parent->name, clk->rate); + if (unlikely(clk->flags & RATE_PROPAGATES)) propagate_rate(clk); --