From patchwork Fri Jul 24 19:45:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Jarzmik X-Patchwork-Id: 6862721 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 029A1C05AC for ; Fri, 24 Jul 2015 19:51:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34F4920585 for ; Fri, 24 Jul 2015 19:51:14 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 52BCA204E2 for ; Fri, 24 Jul 2015 19:51:13 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZIixm-0001DJ-JV; Fri, 24 Jul 2015 19:48:58 +0000 Received: from smtp09.smtpout.orange.fr ([80.12.242.131] helo=smtp.smtpout.orange.fr) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZIixj-0001AZ-Un for linux-arm-kernel@lists.infradead.org; Fri, 24 Jul 2015 19:48:56 +0000 Received: from belgarion ([92.136.205.72]) by mwinf5d32 with ME id wKoR1q00E1aElvg03KoREW; Fri, 24 Jul 2015 21:48:31 +0200 X-ME-Helo: belgarion X-ME-Auth: amFyem1pay5yb2JlcnRAb3JhbmdlLmZy X-ME-Date: Fri, 24 Jul 2015 21:48:31 +0200 X-ME-IP: 92.136.205.72 From: Robert Jarzmik To: arm@kernel.org Subject: [GIT PULL] pxa for v4.3 - v2 X-URL: http://belgarath.falguerolles.org/ Date: Fri, 24 Jul 2015 21:45:13 +0200 Message-ID: <87si8de3w6.fsf@belgarion.home> User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.4 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150724_124856_310174_17A8E43B X-CRM114-Status: GOOD ( 14.06 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Jarzmik , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, Daniel Mack 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.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 Hi Arnd, Kevin, and Olof, This is the pxa pull request for 4.3 development cycle, the second one after a small fix triggered by 0-day kernel builder. It is a quite small one, the main work happening on the drivers side, mostly dmaengine centric work. For the record, the diff from the previous pull request is in [1]. The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754: Linux 4.2-rc1 (2015-07-05 11:01:52 -0700) are available in the git repository at: https://github.com/rjarzmik/linux.git tags/pxa-for-4.3-v2 for you to fetch changes up to 6d6db340a7e832dc18a6a95d9f9fc79d03ff959e: ARM: pxa: Use setup_timer (2015-07-18 12:16:43 +0200) ---------------------------------------------------------------- This is the pxa changes for v4.3 cycle. There is mostly one evolution on the dma side, to enable cooperation of the legacy pxa DMA API, and the new dmaengine API. Once all drivers using DMA are converted, the legacy DMA API should be removed. ---------------------------------------------------------------- Robert Jarzmik (1): ARM: pxa: transition to dmaengine phase 1 Vaishali Thakkar (2): ARM: pxa: Use module_platform_driver ARM: pxa: Use setup_timer arch/arm/mach-pxa/devices.c | 37 ++++++++++++++++++++++++++++++++++++ arch/arm/mach-pxa/pxa25x.c | 1 + arch/arm/mach-pxa/pxa27x.c | 1 + arch/arm/mach-pxa/pxa3xx.c | 1 + arch/arm/mach-pxa/sharpsl_pm.c | 6 ++---- arch/arm/mach-pxa/tosa-bt.c | 15 +-------------- arch/arm/plat-pxa/dma.c | 22 ++++++++++----------- arch/arm/plat-pxa/include/plat/dma.h | 15 +++++++++++++++ 8 files changed, 69 insertions(+), 29 deletions(-) Cheers. --- Robert [1] diff --git a/arch/arm/plat-pxa/include/plat/dma.h b/arch/arm/plat-pxa/include/plat/dma.h index 33ac1a9eb523..28848b344e2d 100644 --- a/arch/arm/plat-pxa/include/plat/dma.h +++ b/arch/arm/plat-pxa/include/plat/dma.h @@ -89,7 +89,7 @@ void pxa_free_dma (int dma_ch); #if defined(CONFIG_PXA_DMA) extern int pxad_toggle_reserved_channel(int legacy_channel); #else -static inline pxad_toggle_reserved_channel(int legacy_channel) +static inline int pxad_toggle_reserved_channel(int legacy_channel) { return 0; }