From patchwork Wed Jun 6 12:29:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ike Panhc X-Patchwork-Id: 163349 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 07889B6FC2 for ; Wed, 6 Jun 2012 22:29:20 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1ScFML-0002z4-Ck; Wed, 06 Jun 2012 12:29:10 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1ScFMH-0002yM-2G for kernel-team@lists.ubuntu.com; Wed, 06 Jun 2012 12:29:05 +0000 Received: from [210.242.151.101] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ScFMG-00064V-7n for kernel-team@lists.ubuntu.com; Wed, 06 Jun 2012 12:29:04 +0000 From: Ike Panhc To: kernel-team@lists.ubuntu.com Subject: [PATCH 15/21] ARM: highbank: enable sp804 based sched_clock Date: Wed, 6 Jun 2012 20:29:01 +0800 Message-Id: <1338985741-26452-1-git-send-email-ike.pan@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1338985555-25924-1-git-send-email-ike.pan@canonical.com> References: <1338985555-25924-1-git-send-email-ike.pan@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Rob Herring BugLink: http://launchpad.net/bugs/1008345 Initialize sched_clock to use the sp804 timer. Signed-off-by: Rob Herring (cherry picked from commit f3b7cd2a9e3de578a462bb507279870dd41e032e) Signed-off-by: Ike Panhc --- arch/arm/mach-highbank/highbank.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 6be0b2f..e1cc3d5 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -141,7 +141,7 @@ static void __init highbank_timer_init(void) lookups[1].clk = of_clk_get(np, 0); clkdev_add_table(lookups, ARRAY_SIZE(lookups)); - sp804_clocksource_init(timer_base + 0x20, "timer1"); + sp804_clocksource_and_sched_clock_init(timer_base + 0x20, "timer1"); sp804_clockevents_init(timer_base, irq, "timer0"); }