From patchwork Wed Mar 13 05:05:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 2261481 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 9D67BDF215 for ; Wed, 13 Mar 2013 05:10:23 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFduD-000521-2W; Wed, 13 Mar 2013 05:07:13 +0000 Received: from mail-pb0-f48.google.com ([209.85.160.48]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFdu2-00050F-UF for linux-arm-kernel@lists.infradead.org; Wed, 13 Mar 2013 05:07:05 +0000 Received: by mail-pb0-f48.google.com with SMTP id wy12so610092pbc.21 for ; Tue, 12 Mar 2013 22:07:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=qC4V/O3sfOXemRPoAcygW6yex1VtHTwZd2/dvq1DGkA=; b=aLc/muxqVR2FCw9nBfFf44fg47Bv4ZUtIt3cvxtDr/DNMvo+oumVPwOwHkQwnqcv4A HmiYN6/rZ+q/m+w/Bj0k9HBeh9O0VOpqc07BfzG4FlMugxeYi+WCiMsijWIqa8yt+Bqi pOhOQ5Rf6J1fO2JfgbK3o1uU7S4SCF73+3bt2BQJFXSllelH1yDdmEjZlRRHW+L+5XdO 0+pqlQjGVfQS60L7vywLrega1knkK/FEoHzgNJ3tqJc6lb5gkc5a6GjiGm96my4FdrQn zz4N5IXc0f1kSmZwSn1lkwVjhSdML0DVNJK4WfC5/5NHNQskuHxejUvbMH4g7xr7yqO0 KNgA== X-Received: by 10.68.138.135 with SMTP id qq7mr42406475pbb.42.1363151220908; Tue, 12 Mar 2013 22:07:00 -0700 (PDT) Received: from localhost.localdomain ([67.198.145.34]) by mx.google.com with ESMTPS id ab1sm27947630pbd.37.2013.03.12.22.06.56 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Mar 2013 22:07:00 -0700 (PDT) From: Haojian Zhuang To: linux@arm.linux.org.uk, linus.walleij@linaro.org, arnd@arndb.de, olof@lixom.net, rob.herring@calxeda.com, linux-arm-kernel@lists.infradead.org, pawel.moll@arm.com, swarren@nvidia.com, john.stultz@linaro.org, tglx@linutronix.de, mturquette@linaro.org Subject: [PATCH v3 01/11] clocksource: move sp timer driver Date: Wed, 13 Mar 2013 13:05:32 +0800 Message-Id: <1363151142-32162-2-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363151142-32162-1-git-send-email-haojian.zhuang@linaro.org> References: <1363151142-32162-1-git-send-email-haojian.zhuang@linaro.org> X-Gm-Message-State: ALoCoQkEEoQPUygHwms8B6CFfEzmyoWYRWU+IXTb9jVPMa1Uw4jKx0snrwNilUJfrCn5SvpdUUp4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130313_010703_168087_CF669599 X-CRM114-Status: GOOD ( 11.35 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.48 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Haojian Zhuang , patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org All clocksource drivers should be moved into drivers/clocksource directory, since it's necessary for integrating them into clocksource_of infrastructure. Move ARM SP804 timer driver from arch/arm directory into drivers/clocksource directory. Signed-off-by: Haojian Zhuang --- arch/arm/Kconfig | 5 ----- arch/arm/common/Makefile | 1 - arch/arm/mach-highbank/highbank.c | 4 ++-- arch/arm/mach-integrator/integrator_ap.c | 2 +- arch/arm/mach-integrator/integrator_cp.c | 4 ++-- arch/arm/mach-realview/core.c | 4 ++-- arch/arm/mach-versatile/core.c | 4 ++-- arch/arm/mach-vexpress/ct-ca9x4.c | 5 ++--- arch/arm/mach-vexpress/v2m.c | 4 ++-- drivers/clocksource/Kconfig | 5 +++++ drivers/clocksource/Makefile | 1 + {arch/arm/common => drivers/clocksource}/timer-sp.c | 2 +- .../arm/include/asm/hardware => include/clocksource}/arm_timer.h | 4 ++-- {arch/arm/include/asm/hardware => include/clocksource}/timer-sp.h | 4 ++++ 14 files changed, 26 insertions(+), 23 deletions(-) rename {arch/arm/common => drivers/clocksource}/timer-sp.c (99%) rename {arch/arm/include/asm/hardware => include/clocksource}/arm_timer.h (93%) rename {arch/arm/include/asm/hardware => include/clocksource}/timer-sp.h (87%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2363926..10d7e2c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1177,11 +1177,6 @@ config PLAT_PXA config PLAT_VERSATILE bool -config ARM_TIMER_SP804 - bool - select CLKSRC_MMIO - select HAVE_SCHED_CLOCK - source arch/arm/mm/Kconfig config ARM_NR_BANKS diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index 45f7eae..a4e49e7 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -12,4 +12,3 @@ obj-$(CONFIG_SHARP_LOCOMO) += locomo.o obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o obj-$(CONFIG_SHARP_SCOOP) += scoop.o obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o -obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index a4f9f50..cfd843b 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -27,14 +27,14 @@ #include #include #include +#include +#include #include #include #include #include #include -#include -#include #include #include #include diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index ea96144..c2112ff 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -41,11 +41,11 @@ #include #include #include +#include #include