From patchwork Mon Jun 3 09:30:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 17436 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9E53623916 for ; Mon, 3 Jun 2013 09:32:21 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id s1sf5034194qcw.6 for ; Mon, 03 Jun 2013 02:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=KyqwjkXQs8+42/BD4J72kx/GFg/QYZmAJ+8haDCfHm4=; b=QofYiujoCh6lcuU0ti9uMLbuuG3aBXpRGvXejuJYw82sS0IvA2lMayNHVtIjwfiN85 Gd/L0RVHquI2gqSaIWsTHxe2qu8+wCUyw84iGiiChefuSdShK/ZDz7RLck3TbodnmjR5 6IIVujVzIswbHqgsQY5mvRleW348ofRy3FzN2T8J5bAqqDyyouaiwPSiV+I33UCI4Csu bZeYLe3a6oEmd1iPJXxaPsKbFN0Cls9rEdo76QDFsByQ/X+Iteu9CYmDxGOqmSy9H5jt iN4VAviM2qoAF/3JDKH6eKSPfAbmuXtJMWjwX4kC2aLmVxPpUBmX/oA14LMR9B+d7bFS hxWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=KyqwjkXQs8+42/BD4J72kx/GFg/QYZmAJ+8haDCfHm4=; b=CVUPf1dn+uREuzLt4GnVFYv2Cn4RajTy7MbCrHnhZw2gzV1eHgf2vpbAHUOuT1TWUo s/+rlIJATu9/CrgKFZMrAJX9ha+ZIkFzxKgUmSDO/SOMWlJzKa+AJOzkT9DP+CaPS8SS 2iPDxMJ3LWJsm9VnOvu75nEd6pypRib0ZeayFk4HmazoXYYU4ued9RhIlQwtxOX+7x1A mVNqGujQo+TNnPYBphMC0+pe4Otrq8r59yNTDcnwIJbAHXxQz5CfrTUgYc7ih5+1lNmK L0BXwMD7v1x4C/mQhUE051CZlkY7/TI0iXLLccn8vaevkNM6H1WIR//FOtyXKhYiEOHd NxIg== X-Received: by 10.224.3.131 with SMTP id 3mr13598466qan.5.1370251941484; Mon, 03 Jun 2013 02:32:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.96.35 with SMTP id dp3ls2074730qeb.87.gmail; Mon, 03 Jun 2013 02:32:21 -0700 (PDT) X-Received: by 10.220.77.4 with SMTP id e4mr13175740vck.5.1370251941221; Mon, 03 Jun 2013 02:32:21 -0700 (PDT) Received: from mail-vb0-x235.google.com (mail-vb0-x235.google.com [2607:f8b0:400c:c02::235]) by mx.google.com with ESMTPS id iz8si34952409vdb.149.2013.06.03.02.32.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 02:32:20 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::235; Received: by mail-vb0-f53.google.com with SMTP id p12so155294vbe.26 for ; Mon, 03 Jun 2013 02:32:20 -0700 (PDT) X-Received: by 10.52.157.138 with SMTP id wm10mr14052589vdb.57.1370251940115; Mon, 03 Jun 2013 02:32:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.10.206 with SMTP id pb14csp71063vcb; Mon, 3 Jun 2013 02:32:19 -0700 (PDT) X-Received: by 10.69.12.65 with SMTP id eo1mr22717201pbd.205.1370251939187; Mon, 03 Jun 2013 02:32:19 -0700 (PDT) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by mx.google.com with ESMTPS id kx5si39430919pbc.20.2013.06.03.02.32.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 02:32:19 -0700 (PDT) Received-SPF: pass (google.com: domain of haojian.zhuang@gmail.com designates 209.85.192.182 as permitted sender) client-ip=209.85.192.182; Received: by mail-pd0-f182.google.com with SMTP id g10so5390116pdj.27 for ; Mon, 03 Jun 2013 02:32:18 -0700 (PDT) X-Received: by 10.68.164.226 with SMTP id yt2mr23093618pbb.203.1370251938144; Mon, 03 Jun 2013 02:32:18 -0700 (PDT) Received: from localhost.localdomain ([27.115.121.40]) by mx.google.com with ESMTPSA id wi6sm58333510pbc.22.2013.06.03.02.32.13 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 02:32:17 -0700 (PDT) From: Haojian Zhuang To: tglx@linutronix.de, arnd@arndb.de, linux-arm-kernel@lists.infradead.org, chao.xie@marvell.com, john.stultz@linaro.org, mturquette@linaro.org, eric.y.miao@gmail.com Cc: patches@linaro.org, Haojian Zhuang Subject: [PATCH v3 06/11] clocksource: mmp: move mmp timer driver Date: Mon, 3 Jun 2013 17:30:40 +0800 Message-Id: <1370251845-31373-7-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1370251845-31373-1-git-send-email-haojian.zhuang@gmail.com> References: <1370251845-31373-1-git-send-email-haojian.zhuang@gmail.com> X-Gm-Message-State: ALoCoQlO1i1+pC6slhr53cc7iGoclL9835okAsggjj6akUXqeuiu8gIe5rWoQz+4dlxfBPtfhEtQ X-Original-Sender: haojian.zhuang@gmail.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@gmail.com Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Move timer-mmp driver from mach-mmp to clocksource directory. Signed-off-by: Haojian Zhuang --- arch/arm/mach-mmp/Makefile | 2 +- drivers/clocksource/Makefile | 1 + arch/arm/mach-mmp/time.c => drivers/clocksource/timer-mmp.c | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) rename arch/arm/mach-mmp/time.c => drivers/clocksource/timer-mmp.c (99%) diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile index 9b702a1..5d4ccc6 100644 --- a/arch/arm/mach-mmp/Makefile +++ b/arch/arm/mach-mmp/Makefile @@ -2,7 +2,7 @@ # Makefile for Marvell's PXA168 processors line # -obj-y += common.o devices.o time.o +obj-y += common.o devices.o # SoC support obj-$(CONFIG_CPU_PXA168) += pxa168.o diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 8d979c7..f6aa3b6 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -17,6 +17,7 @@ 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_MARCO) += timer-marco.o +obj-$(CONFIG_ARCH_MMP) += timer-mmp.o obj-$(CONFIG_ARCH_MXS) += mxs_timer.o obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o diff --git a/arch/arm/mach-mmp/time.c b/drivers/clocksource/timer-mmp.c similarity index 99% rename from arch/arm/mach-mmp/time.c rename to drivers/clocksource/timer-mmp.c index 86a18b3..553e3de 100644 --- a/arch/arm/mach-mmp/time.c +++ b/drivers/clocksource/timer-mmp.c @@ -37,8 +37,6 @@ #include #include -#include "clock.h" - #define TIMERS_VIRT_BASE TIMERS1_VIRT_BASE #define MAX_DELTA (0xfffffffe)