Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760991Ab2JaXM5 (ORCPT ); Wed, 31 Oct 2012 19:12:57 -0400 Received: from mailserver5.natinst.com ([130.164.80.5]:57338 "EHLO spamkiller05.natinst.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753566Ab2JaXMw (ORCPT ); Wed, 31 Oct 2012 19:12:52 -0400 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 Cc: devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-serial@vger.kernel.org, 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3372 Lines: 101 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); -- 1.8.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/