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: 15311 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 47CDB23E2E for ; Wed, 13 Mar 2013 05:07:04 +0000 (UTC) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by fiordland.canonical.com (Postfix) with ESMTP id CD72EA18684 for ; Wed, 13 Mar 2013 05:07:03 +0000 (UTC) Received: by mail-vb0-f48.google.com with SMTP id fc21so275561vbb.35 for ; Tue, 12 Mar 2013 22:07:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=qC4V/O3sfOXemRPoAcygW6yex1VtHTwZd2/dvq1DGkA=; b=EG2QA3uotlX1Nt9W9ENGnMP1RDmgfpcAgYPHuJ3ip6rbpRe1e2ziANtKrNm/nAnG+P eaHCzd8OzdI7Rue5gzapJEW0REYjotpQ3DZrru0xC2ce8CNnk6xHjYGCFsxx/l0X+TQl SBib4RK0u0d0ay/gLPm32YSyuZtPIrokGyyAHcz6NyIWk3M47SLDShMeV0Ma6qGlO7hH frHVAN/m6+QNrIwIsRdeKF1h1EP1PRkldkp1kln4aFuQkv+KeZjZtg9D1BKTeOiY54Es KzFrPcZd1751Bc/1gtn1ZVgQpPZ7IGUz3LQ2s1lIlHgyjvLUHk1fLiPDywA+40rZRRRk 3k8g== X-Received: by 10.52.18.148 with SMTP id w20mr6679405vdd.8.1363151223305; Tue, 12 Mar 2013 22:07:03 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp1621veb; Tue, 12 Mar 2013 22:07:02 -0700 (PDT) X-Received: by 10.68.244.1 with SMTP id xc1mr42166209pbc.165.1363151222178; Tue, 12 Mar 2013 22:07:02 -0700 (PDT) Received: from mail-pb0-f46.google.com (mail-pb0-f46.google.com [209.85.160.46]) by mx.google.com with ESMTPS id qp8si33575451pbc.63.2013.03.12.22.07.01 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Mar 2013 22:07:02 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.46 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) client-ip=209.85.160.46; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.46 is neither permitted nor denied by best guess record for domain of haojian.zhuang@linaro.org) smtp.mail=haojian.zhuang@linaro.org Received: by mail-pb0-f46.google.com with SMTP id uo15so618804pbc.19 for ; Tue, 12 Mar 2013 22:07:01 -0700 (PDT) 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 Cc: patches@linaro.org, Haojian Zhuang 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: ALoCoQnT/TstX4oZVwCChleyxZ2Rop9OSb0qYjZ8aD5sqKlDh12hRCEJSPvRkvEbSyknU2TdAQMo 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