From patchwork Fri Jul 26 10:05:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 2833964 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 912F6C0319 for ; Fri, 26 Jul 2013 10:11:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B42D420148 for ; Fri, 26 Jul 2013 10:11:57 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 327DD2014C for ; Fri, 26 Jul 2013 10:11:56 +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 1V2ezP-00014e-HD; Fri, 26 Jul 2013 10:11: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 1V2ez3-0003tT-3R; Fri, 26 Jul 2013 10:10:49 +0000 Received: from mail-pb0-x22c.google.com ([2607:f8b0:400e:c01::22c]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V2eyy-0003rP-Cb for linux-arm-kernel@lists.infradead.org; Fri, 26 Jul 2013 10:10:45 +0000 Received: by mail-pb0-f44.google.com with SMTP id wy7so1854765pbc.31 for ; Fri, 26 Jul 2013 03:10:22 -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=/h73glbkMhqww8kpFdC26nsa6fH6sk7rODk8D8lkGKo=; b=JnRT3qlbHdLOY1cjQlODl1MA5XZIblQMS4GYtNs0kYALeV0c+foZkXOqi/sX3qRJQd tWu/IcmeCJ+zQX+4riwJ21ToqPaaSGjzuMhn+b9gwOozEtUgVjlyF/BuGCVzczPBTnYo REXIPiQCksZODpSQxyqIfHaYDvkuUrWE2eKmyZdjXD58uEeKcRJSwnJgJBQDZUAbdgrN la/mfD3HijBxBGnp7M+7gjnKRhjSlSqfUB56FwSszHJK/J/YJRvncvzFrApuDAydVSGC 8TRasevZhyuUnlyaStOGYyltYPXGjkjg7SqB6yusqQr1njG68OHpqgp2xGXKfnvng9Ut XQ8g== X-Received: by 10.68.235.103 with SMTP id ul7mr53025604pbc.14.1374833422937; Fri, 26 Jul 2013 03:10:22 -0700 (PDT) Received: from localhost.localdomain ([67.229.68.101]) by mx.google.com with ESMTPSA id kc8sm59263070pbc.18.2013.07.26.03.10.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 26 Jul 2013 03:10:22 -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, olof@lixom.net Subject: [PATCH v6 06/11] clocksource: mmp: move mmp timer driver Date: Fri, 26 Jul 2013 18:05:28 +0800 Message-Id: <1374833133-21119-7-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1374833133-21119-1-git-send-email-haojian.zhuang@gmail.com> References: <1374833133-21119-1-git-send-email-haojian.zhuang@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130726_061044_523080_528EBE67 X-CRM114-Status: GOOD ( 11.11 ) X-Spam-Score: -2.0 (--) 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 X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move timer-mmp driver from mach-mmp to clocksource directory. Signed-off-by: Haojian Zhuang Reviewed-by: Daniel Drake --- 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 8b00c5c..7dda633 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_ARMADA_370_XP_TIMER) += time-armada-370-xp.o obj-$(CONFIG_ORION_TIMER) += time-orion.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 7ac41e8..ddc1b15 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)