| Submitter | Will Deacon |
|---|---|
| Date | Feb. 4, 2013, 1:55 p.m. |
| Message ID | <1359986131-13034-3-git-send-email-will.deacon@arm.com> |
| Download | mbox |
| Permalink | /patch/218016/ |
| State | New |
| Headers | show
Return-Path: <linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CAF402C02AC for <incoming-imx@patchwork.ozlabs.org>; Tue, 5 Feb 2013 04:53:38 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U2QBs-0005qh-02; Mon, 04 Feb 2013 17:50:48 +0000 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U2MWN-0007mN-Hs for linux-arm-kernel@lists.infradead.org; Mon, 04 Feb 2013 13:55:44 +0000 Received: from mudshark.cambridge.arm.com (mudshark.cambridge.arm.com [10.1.79.58]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id r14DtZki018648; Mon, 4 Feb 2013 13:55:35 GMT Received: by mudshark.cambridge.arm.com (Postfix, from userid 1000) id CF602C2B16; Mon, 4 Feb 2013 13:55:33 +0000 (GMT) From: Will Deacon <will.deacon@arm.com> To: arnd@arndb.de, olof@lixom.net Subject: [GIT PULL 3/4] Move arch-timer into drivers/clocksource for 3.9 Date: Mon, 4 Feb 2013 13:55:30 +0000 Message-Id: <1359986131-13034-3-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1359986131-13034-1-git-send-email-will.deacon@arm.com> References: <1359986131-13034-1-git-send-email-will.deacon@arm.com> X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130204_085543_799736_CA0AD165 X-CRM114-Status: GOOD ( 12.11 ) X-Spam-Score: -7.6 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [217.140.96.50 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Mailman-Approved-At: Mon, 04 Feb 2013 12:50:34 -0500 Cc: mark.rutland@arm.com, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org |
Hi Arnd, Olof, This set of changes moves the arch-timer driver out from arch/arm/ and into drivers/clocksource and unifies the new driver with the arm64 copy. This depends on for-rmk/broadcast, which is the second pull request in this series. Cheers, Will --->8 The following changes since commit 04c2eee5b9dfcb13f3cd07a5537fb8c785f2751a: Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2013-01-31 17:10:36 +1100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git for-arm-soc/arch-timers for you to fetch changes up to 9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a: Merge branch 'for-will/arch-timer-unification' of git://linux-arm.org/linux-mr into for-arm-soc/arch-timers (2013-02-01 10:28:36 +0000) ---------------------------------------------------------------- Marc Zyngier (1): ARM: arch_timers: switch to physical timers if HYP mode is available Mark Rutland (17): arm: arch_timer: balance device_node refcounting arm: arch_timer: remove redundant available check arm: arch_timer: use u64/u32 for register data arm: arch_timer: standardise counter reading arm: arch_timer: split cntfrq accessor arm: arch_timer: factor out register accessors arm: arch_timer: add isbs to register accessors arm: arch_timer: divorce from local_timer api arm: arch_timer: add arch_counter_set_user_access arm: arch_timer: move core to drivers/clocksource arm64: arm_generic: prevent reading stale time arm64: move from arm_generic to arm_arch_timer Documentation: Add ARMv8 to arch_timer devicetree clockevents: Add generic timer broadcast receiver clockevents: Add generic timer broadcast function arm: Use generic timer broadcast receiver arm: Add generic timer broadcast support Will Deacon (3): Merge branch 'timers/for-arm' of git://git.kernel.org/.../tip/tip into for-rmk/broadcast Merge branch 'clocks/broadcast-arm' of git://linux-arm.org/linux-mr into for-rmk/broadcast Merge branch 'for-will/arch-timer-unification' of git://linux-arm.org/linux-mr into for-arm-soc/arch-timers .../devicetree/bindings/arm/arch_timer.txt | 7 +- arch/arm/Kconfig | 4 +- arch/arm/include/asm/arch_timer.h | 109 ++++- arch/arm/kernel/arch_timer.c | 504 +-------------------- arch/arm/kernel/smp.c | 13 +- arch/arm/mach-omap2/Kconfig | 2 +- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/arch_timer.h | 133 ++++++ arch/arm64/include/asm/arm_generic.h | 100 ---- arch/arm64/kernel/time.c | 29 +- drivers/clocksource/Kconfig | 6 +- drivers/clocksource/Makefile | 2 +- drivers/clocksource/arm_arch_timer.c | 391 ++++++++++++++++ drivers/clocksource/arm_generic.c | 232 ---------- include/clocksource/arm_arch_timer.h | 63 +++ include/clocksource/arm_generic.h | 21 - include/linux/clockchips.h | 9 + kernel/time/Kconfig | 4 + kernel/time/tick-broadcast.c | 30 ++ 19 files changed, 796 insertions(+), 864 deletions(-) create mode 100644 arch/arm64/include/asm/arch_timer.h delete mode 100644 arch/arm64/include/asm/arm_generic.h create mode 100644 drivers/clocksource/arm_arch_timer.c delete mode 100644 drivers/clocksource/arm_generic.c create mode 100644 include/clocksource/arm_arch_timer.h delete mode 100644 include/clocksource/arm_generic.h