From patchwork Wed May 19 02:18:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 100746 X-Patchwork-Delegate: paul@pwsan.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4J2LKel022912 for ; Wed, 19 May 2010 02:21:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756271Ab0ESCVR (ORCPT ); Tue, 18 May 2010 22:21:17 -0400 Received: from utopia.booyaka.com ([72.9.107.138]:39827 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755908Ab0ESCVF (ORCPT ); Tue, 18 May 2010 22:21:05 -0400 Received: (qmail 19219 invoked by uid 1019); 19 May 2010 02:21:03 -0000 MBOX-Line: From nobody Tue May 18 20:18:58 2010 Subject: [PATCH 17/22] OMAP: timers: Fix clock source names for OMAP4 To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org From: Paul Walmsley Cc: Rajendra Nayak Date: Tue, 18 May 2010 20:18:58 -0600 Message-ID: <20100519021856.19716.41561.stgit@localhost.localdomain> In-Reply-To: <20100519021800.19716.8938.stgit@localhost.localdomain> References: <20100519021800.19716.8938.stgit@localhost.localdomain> User-Agent: StGit/0.15-52-gc391 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 19 May 2010 02:21:20 +0000 (UTC) diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 4d99dfb..c64875f 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -264,8 +264,8 @@ static struct omap_dm_timer omap4_dm_timers[] = { { .phys_base = 0x4a320000, .irq = OMAP44XX_IRQ_GPT12 }, }; static const char *omap4_dm_source_names[] __initdata = { - "sys_ck", - "omap_32k_fck", + "sys_clkin_ck", + "sys_32k_ck", NULL }; static struct clk *omap4_dm_source_clocks[2];