From patchwork Mon Oct 29 18:42:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Cartwright X-Patchwork-Id: 1682501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id C68CD4005F for ; Wed, 31 Oct 2012 23:17:33 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TThUa-0005Kp-CG; Wed, 31 Oct 2012 23:14:36 +0000 Received: from mailserver5.natinst.com ([130.164.80.5] helo=spamkiller05.natinst.com) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TThSj-0004Vc-8s for linux-arm-kernel@lists.infradead.org; Wed, 31 Oct 2012 23:12:45 +0000 Received: from mailserv58-us.natinst.com (nb-hsrp-1338.natinst.com [130.164.19.133]) by spamkiller05.natinst.com (8.14.5/8.14.5) with ESMTP id q9VNCSXo031247; Wed, 31 Oct 2012 18:12:28 -0500 Received: from beefymiracle.amer.corp.natinst.com ([130.164.14.197]) by mailserv58-us.natinst.com (Lotus Domino Release 8.5.3FP2 HF169) with ESMTP id 2012103118122811-863466 ; Wed, 31 Oct 2012 18:12:28 -0500 Received: by beefymiracle.amer.corp.natinst.com (Postfix, from userid 1000) id 9388E671A6; Wed, 31 Oct 2012 17:12:35 -0600 (CST) Message-Id: In-Reply-To: References: From: Josh Cartwright Date: Mon, 29 Oct 2012 12:42:13 -0600 Subject: [PATCH 2/8] ARM: zynq: move ttc timer code to drivers/clocksource To: Grant Likely , Rob Herring , Russell King , Mike Turquette , John Stultz , Thomas Gleixner , Alan Cox , Greg Kroah-Hartman , John Linn , Michal Simek X-MIMETrack: Itemize by SMTP Server on MailServ58-US/AUS/H/NIC(Release 8.5.3FP2 HF169|September 14, 2012) at 10/31/2012 06:12:28 PM, Serialize by Router on MailServ58-US/AUS/H/NIC(Release 8.5.3FP2 HF169|September 14, 2012) at 10/31/2012 06:12:28 PM, Serialize complete at 10/31/2012 06:12:28 PM X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.7.7855, 1.0.431, 0.0.0000 definitions=2012-10-31_03:2012-10-31, 2012-10-31, 1970-01-01 signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121031_191241_897628_70CFF48D X-CRM114-Status: GOOD ( 13.08 ) X-Spam-Score: 1.1 (+) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (1.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -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: Michal Simek , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.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: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Suggested cleanup by Arnd Bergmann. Move the ttc timer.c code to drivers/clocksource, and out of the mach-zynq directory. The common.h (which only held the timer declaration) was renamed to xilinx_ttc.h and moved into include/linux. Signed-off-by: Josh Cartwright Cc: Arnd Bergmann --- arch/arm/mach-zynq/Makefile | 2 +- arch/arm/mach-zynq/common.c | 2 +- drivers/clocksource/Makefile | 1 + arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c | 1 - arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename arch/arm/mach-zynq/timer.c => drivers/clocksource/xilinx_ttc.c (99%) rename arch/arm/mach-zynq/common.h => include/linux/xilinx_ttc.h (91%) diff --git a/arch/arm/mach-zynq/Makefile b/arch/arm/mach-zynq/Makefile index 397268c..320faed 100644 --- a/arch/arm/mach-zynq/Makefile +++ b/arch/arm/mach-zynq/Makefile @@ -3,4 +3,4 @@ # # Common support -obj-y := common.o timer.o +obj-y := common.o diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 6f058258..0279ea7 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -32,7 +33,6 @@ #include #include -#include "common.h" static struct of_device_id zynq_of_bus_ids[] __initdata = { { .compatible = "simple-bus", }, diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 603be36..f27c7b1 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -14,5 +14,6 @@ obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o obj-$(CONFIG_CLKSRC_DBX500_PRCMU) += clksrc-dbx500-prcmu.o obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o obj-$(CONFIG_ARCH_BCM2835) += bcm2835_timer.o +obj-$(CONFIG_ARCH_ZYNQ) += xilinx_ttc.o obj-$(CONFIG_CLKSRC_ARM_GENERIC) += arm_generic.o diff --git a/arch/arm/mach-zynq/timer.c b/drivers/clocksource/xilinx_ttc.c similarity index 99% rename from arch/arm/mach-zynq/timer.c rename to drivers/clocksource/xilinx_ttc.c index c93cbe5..ff38b3e 100644 --- a/arch/arm/mach-zynq/timer.c +++ b/drivers/clocksource/xilinx_ttc.c @@ -25,7 +25,6 @@ #include #include -#include "common.h" #define IRQ_TIMERCOUNTER0 42 diff --git a/arch/arm/mach-zynq/common.h b/include/linux/xilinx_ttc.h similarity index 91% rename from arch/arm/mach-zynq/common.h rename to include/linux/xilinx_ttc.h index 954b91c..303a3fd 100644 --- a/arch/arm/mach-zynq/common.h +++ b/include/linux/xilinx_ttc.h @@ -14,8 +14,8 @@ * GNU General Public License for more details. */ -#ifndef __MACH_ZYNQ_COMMON_H__ -#define __MACH_ZYNQ_COMMON_H__ +#ifndef __XILINX_TTC_H__ +#define __XILINX_TTC_H__ void __init xttcpss_timer_init(void);