From patchwork Tue Jan 22 13:08:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 214539 Return-Path: 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 C1D0A2C0080 for ; Wed, 23 Jan 2013 00:12:48 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxdaL-0005S7-0m; Tue, 22 Jan 2013 13:08:17 +0000 Received: from mail-ie0-f182.google.com ([209.85.223.182]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TxdaH-0005RU-Ty for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2013 13:08:14 +0000 Received: by mail-ie0-f182.google.com with SMTP id s9so11591254iec.27 for ; Tue, 22 Jan 2013 05:08:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-received:sender:date:x-google-sender-auth:message-id :subject:from:to:cc:content-type:x-gm-message-state; bh=Nex9drgzXEX9CWlg4OGdqCejZMkYTMYHZbS6MaAWQWU=; b=itWDaBZJs7AMnwA+vBuKqlOQupLwCuOxY3cb5GeCdDwjItr23zun+S/SHmDgFuvUzf XIFNRRsNPln1/0XIdU9CdC+TePVQUUVjQvqJmbNjFF7V7cWuvtBJHxLFZJSZwWiuVija R9HZNNuVAATCd/3nljr7AxHd5Obey9abl30vj3ZT2ak8EPsswFdrdS6luYHZp31Xidk3 JdMn1EiMriZOSbYxAlOewFA7/ayOL5dS6KNUMyVDqjAdDGipbkNmL9bzsYIpDdzwzlrk D25dfgfhcMet7LqCPsgP6OuAHg15kIzmIA6kx/1CjFKuScdU8swvHAuGuF8zc4JedtwM nnmw== MIME-Version: 1.0 X-Received: by 10.43.7.7 with SMTP id om7mr14402199icb.25.1358860092489; Tue, 22 Jan 2013 05:08:12 -0800 (PST) Received: by 10.64.44.9 with HTTP; Tue, 22 Jan 2013 05:08:12 -0800 (PST) Date: Tue, 22 Jan 2013 14:08:12 +0100 X-Google-Sender-Auth: L7SZybV5EKnAGdHAMbE3Nh-N_cU Message-ID: Subject: [GIT PULL v2] arm-soc: Xilinx zynq timer changes for v3.9 From: Michal Simek To: Arnd Bergmann , Olof Johansson , arm@kernel.org X-Gm-Message-State: ALoCoQmi0vvG3SfncreIWrTP9RPITH49+bLcsKRND2R6LMW6Ntys/1lz2C3C8jHbrcpYf1NqHE80 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130122_080813_998511_18F04048 X-CRM114-Status: UNSURE ( 9.28 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.223.182 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Michal Simek , linux-arm X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 and Olof, please pull these timer changes to your arm-soc tree. As Arnd suggested this branch v2 is based on timer/cleanup and clocksource/cleanup arm-soc branches. There was one conflict with arch/arm/mach-pxa/time.c which I have resolved like Olof in the patch "Merge branch 'clocksource/cleanup' into next/cleanup" (sha1: 8d84981e395850aab31c3f2ca7e2738e03f671d7). (Also changed indentation in the pxa timer driver as Olof has done) Arnd also mentioned to move this timer driver to drivers/clocksource (+ use the new infrastructure introduced there) but this need to be a separate patch which must be reviewed first. Please let me know if I miss something. Thanks, Michal The following changes since commit 05ed8a3e5c3a48b5b63305920f88da94d9272b36: Michal Simek (1): Merge branch 'clocksource/cleanup' into zynq/timer are available in the git repository at: git://git.xilinx.com/linux-xlnx.git zynq/timer Soren Brinkmann (7): arm: zynq: timer: Replace PSS through PS arm: zynq: timer: Remove unnecessary register write arm: zynq: timer: Remove unused #defines arm: zynq: timer: Align columns arm: zynq: timer: Remove redundant #includes arm: zynq: timer: Fix comment style arm: zynq: timer: Set clock_event cpumask arch/arm/mach-zynq/common.c | 2 +- arch/arm/mach-zynq/common.h | 2 +- arch/arm/mach-zynq/timer.c | 150 ++++++++++++++++++++---------------------- 3 files changed, 73 insertions(+), 81 deletions(-)