From patchwork Tue Jul 10 21:39:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dinh Nguyen X-Patchwork-Id: 1178961 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 859D2DFF34 for ; Tue, 10 Jul 2012 21:43:37 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SoiAo-0004Sh-0H; Tue, 10 Jul 2012 21:40:46 +0000 Received: from va3ehsobe006.messaging.microsoft.com ([216.32.180.16] helo=va3outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SoiAb-0004RR-K2 for linux-arm-kernel@lists.infradead.org; Tue, 10 Jul 2012 21:40:35 +0000 Received: from mail122-va3-R.bigfish.com (10.7.14.247) by VA3EHSOBE010.bigfish.com (10.7.40.12) with Microsoft SMTP Server id 14.1.225.22; Tue, 10 Jul 2012 21:38:09 +0000 Received: from mail122-va3 (localhost [127.0.0.1]) by mail122-va3-R.bigfish.com (Postfix) with ESMTP id 88D2B1202CA; Tue, 10 Jul 2012 21:38:09 +0000 (UTC) X-Forefront-Antispam-Report: CIP:66.35.227.6; KIP:(null); UIP:(null); IPV:NLI; H:sj-smtp01.altera.com; RD:sj-smtp01.altera.com; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2fh2a8h668h839hd24he5bhf0ah107ah) Received-SPF: pass (mail122-va3: domain of altera.com designates 66.35.227.6 as permitted sender) client-ip=66.35.227.6; envelope-from=dinguyen@altera.com; helo=sj-smtp01.altera.com ; 1.altera.com ; Received: from mail122-va3 (localhost.localdomain [127.0.0.1]) by mail122-va3 (MessageSwitch) id 1341956287670302_29979; Tue, 10 Jul 2012 21:38:07 +0000 (UTC) Received: from VA3EHSMHS038.bigfish.com (unknown [10.7.14.245]) by mail122-va3.bigfish.com (Postfix) with ESMTP id 9F0862C0081; Tue, 10 Jul 2012 21:38:07 +0000 (UTC) Received: from sj-smtp01.altera.com (66.35.227.6) by VA3EHSMHS038.bigfish.com (10.7.99.48) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 10 Jul 2012 21:38:07 +0000 Received: from dinguyen-VirtualBox.altera.com ([137.57.188.54]) by sj-smtp01.altera.com (8.13.7+Sun/8.13.7) with ESMTP id q6ALiEmn002068; Tue, 10 Jul 2012 14:44:52 -0700 (PDT) From: To: Subject: [PATCH v2 2/2] arm: picoxcell: Make use of dw_apb_timer_of Date: Tue, 10 Jul 2012 16:39:41 -0500 Message-ID: <1341956381-496-2-git-send-email-dinguyen@altera.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341956381-496-1-git-send-email-dinguyen@altera.com> References: <1341956381-496-1-git-send-email-dinguyen@altera.com> MIME-Version: 1.0 X-OriginatorOrg: altera.com X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [216.32.180.16 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: thomas.petazzoni@free-electrons.com, wd@denx.de, johnstul@us.ibm.com, cytan@altera.com, Dinh Nguyen , pavel@denx.de, jamie@jamieiles.com, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Dinh Nguyen Make use of the move dw_apb_timer_of device tree implementation in clocksource. Signed-off-by: Pavel Machek Signed-off-by: Dinh Nguyen --- arch/arm/mach-picoxcell/Makefile | 1 - arch/arm/mach-picoxcell/common.c | 3 ++- arch/arm/mach-picoxcell/common.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-picoxcell/Makefile b/arch/arm/mach-picoxcell/Makefile index e5ec4a8..8e39f80 100644 --- a/arch/arm/mach-picoxcell/Makefile +++ b/arch/arm/mach-picoxcell/Makefile @@ -1,2 +1 @@ obj-y := common.o -obj-y += time.o diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c index a2e8ae8..8f9a0b4 100644 --- a/arch/arm/mach-picoxcell/common.c +++ b/arch/arm/mach-picoxcell/common.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -97,7 +98,7 @@ DT_MACHINE_START(PICOXCELL, "Picochip picoXcell") .nr_irqs = NR_IRQS_LEGACY, .init_irq = picoxcell_init_irq, .handle_irq = vic_handle_irq, - .timer = &picoxcell_timer, + .timer = &dw_apb_timer, .init_machine = picoxcell_init_machine, .dt_compat = picoxcell_dt_match, .restart = picoxcell_wdt_restart, diff --git a/arch/arm/mach-picoxcell/common.h b/arch/arm/mach-picoxcell/common.h index 83d55ab..a65cb02 100644 --- a/arch/arm/mach-picoxcell/common.h +++ b/arch/arm/mach-picoxcell/common.h @@ -12,6 +12,6 @@ #include -extern struct sys_timer picoxcell_timer; +extern struct sys_timer dw_apb_timer; #endif /* __PICOXCELL_COMMON_H__ */