From patchwork Tue Jun 4 04:12:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 2656571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id DC1703FC8C for ; Tue, 4 Jun 2013 04:20:00 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UjigH-0004lg-5m; Tue, 04 Jun 2013 04:17:12 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UjifV-0000vR-2T; Tue, 04 Jun 2013 04:16:21 +0000 Received: from mail-ie0-x236.google.com ([2607:f8b0:4001:c03::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ujif6-0000pA-06 for linux-arm-kernel@lists.infradead.org; Tue, 04 Jun 2013 04:15:57 +0000 Received: by mail-ie0-f182.google.com with SMTP id 9so7457668iec.27 for ; Mon, 03 Jun 2013 21:15:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=KyqwjkXQs8+42/BD4J72kx/GFg/QYZmAJ+8haDCfHm4=; b=b9bIqdYCzJM9aT+nErVDzCg3r//oO6ozXExFQiPv6cMF3bs80zo0uU7WEBCVLZt0XO Wzst4aTuTKdrRWP8L418tAeUPTcXmedxudn8ErJViTTUj6T9WBJHvs4hlYvbb3FjjACn Vh9oGuAdhIC0G3nBeYYRleSsKNrOUEDj6GP0XhrD66P/37OZAjnN5B53pwPyvApTzpwi WMnGl5ss92PH4nfey318U7ZI71YVN+qXnwG91BVDG1ZWSTCTOkPvNDJNcF8Y1lei2NB5 gORxkNOlkjNMUJ5Bh4uxoDN+tyfZ2oWWOfqP7hA5Av9MAx91H/Q86FyiV1GyIiRlit3z cmfA== X-Received: by 10.50.36.39 with SMTP id n7mr634879igj.64.1370319334962; Mon, 03 Jun 2013 21:15:34 -0700 (PDT) Received: from localhost.localdomain ([67.229.68.100]) by mx.google.com with ESMTPSA id k10sm22887440ige.0.2013.06.03.21.15.30 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 21:15:34 -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, linux@arm.linux.org.uk Subject: [PATCH v4 06/10] clocksource: mmp: move mmp timer driver Date: Tue, 4 Jun 2013 12:12:48 +0800 Message-Id: <1370319172-31788-7-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1370319172-31788-1-git-send-email-haojian.zhuang@gmail.com> References: <1370319172-31788-1-git-send-email-haojian.zhuang@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130604_001556_100464_331BD90B X-CRM114-Status: GOOD ( 11.84 ) X-Spam-Score: 0.2 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (haojian.zhuang[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 2.2 TO_NO_BRKTS_PCNT To: misformatted + percentage Cc: Haojian Zhuang 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 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)