From patchwork Sat Mar 1 06:13:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 325389 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 097172C00AB for ; Sat, 1 Mar 2014 17:14:29 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJdBH-0006R6-K6; Sat, 01 Mar 2014 06:13:51 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJdBF-0006Bl-AT; Sat, 01 Mar 2014 06:13:49 +0000 Received: from mho-03-ewr.mailhop.org ([204.13.248.66] helo=mho-01-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WJdBC-0006BQ-7R for linux-arm-kernel@lists.infradead.org; Sat, 01 Mar 2014 06:13:46 +0000 Received: from pool-108-39-110-144.nrflva.fios.verizon.net ([108.39.110.144] helo=titan) by mho-01-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1WJdAq-0009hp-EA; Sat, 01 Mar 2014 06:13:24 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id CC28D536EE6; Sat, 1 Mar 2014 01:13:21 -0500 (EST) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 108.39.110.144 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19QwgQIULJWtY1SY2DSzqshpOHzHHPeSfw= X-DKIM: OpenDKIM Filter v2.0.1 titan CC28D536EE6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lakedaemon.net; s=mail; t=1393654401; bh=nFGBR3QqMdJGRlTQ6cDFRPmeqbb1cPuYf3SO6WbH1Uk=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=rfD0d34tPiejutf5NYQ5VX7Ms7Hn3g1rUlAK7Qt1DdYNPiryGyPnO/Tedsoka+jzs hwbPmUfThGINUoVKJeM9j1Loj30qi7WdviXsDestCfoat05KssA2GJcvHKjmphnk6G TCF+289hlIyKgiN+Jdo+fBU0hkRd1HCJFK9UnA6KpRpmmXOlwT5i4OxJrf5vt6TFxp RMumQMuUwvtM7jGgYh6hTcEpUFZ5sW997mTOc+kVduHozhqv8l/0zf1wVHQpTkrD7q gNr+zj1UxcQGNAMHWPm6KEUK3Tq8V1e/jZf5ZDVCXyF8K+DxBQ4ZkfkMDqvdGss0iS d6OSpTjkT+ASQ== Date: Sat, 1 Mar 2014 01:13:21 -0500 From: Jason Cooper To: Linus Walleij Subject: [GIT PULL] pinctrl: mvebu: driver changes for v3.15 Message-ID: <20140301061321.GU1872@titan.lakedaemon.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140301_011346_323885_2AE05F36 X-CRM114-Status: GOOD ( 11.86 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.66 listed in list.dnswl.org] -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 Cc: Gregory CLEMENT , Andrew Lunn , Sebastian Hesselbarth , Linux ARM Kernel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Linus, Here's the pull request we talked about earlier in the week. I've merged them all into one branch as you requested. This branch is currently included in mvebu/for-next which is included in linux-next. Both for testing. This branch is only required for boot testing. There are no other dependencies. This series does touch dove.dtsi, but doesn't conflict with anything we are sending up this cycle. If you need to rebase these, please let me know so I can pull them out of mvebu/for-next. We don't want a conflict in linux-next. Also, in the case of a rebase, if you could provide a topic branch for us to pull in so we can continue testing, that would be much appreciated. These changes have been in -next for 3 days. Please pull. thx, Jason. The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72: Linus 3.14-rc1 (2014-02-02 16:42:13 -0800) are available in the git repository at: git://git.infradead.org/linux-mvebu.git tags/mvebu-pinctrl-3.15 for you to fetch changes up to 03366607962ced33f7f0253f5aa229f599ff7e01: Merge tag 'tags/for-mvebu-pinctrl-3xx' into mvebu/pinctrl (2014-03-01 05:50:51 +0000) ---------------------------------------------------------------- mvebu pinctrl changes for v3.15 - various cleanup and refactorization - add drivers for the Armada 375, 380, and 385 SoCs - prepare dove for SoC code moving into mach-mvebu - DT documentation updates ---------------------------------------------------------------- Jason Cooper (3): Merge tag 'tags/for-mvebu-pinctrl-cleanup' into mvebu/pinctrl Merge tag 'tags/for-mvebu-pinctrl-dove' into mvebu/pinctrl Merge tag 'tags/for-mvebu-pinctrl-3xx' into mvebu/pinctrl Sebastian Hesselbarth (23): pinctrl: mvebu: count unnamed controls and allocate name buffer pinctrl: mvebu: remove obsolete per-control name buffer allocation pinctrl: mvebu: identify generic controls by name pinctrl: mvebu: remove passing mvebu_mpp_ctrl to callbacks pinctrl: mvebu: add common mpp reg helper to mvebu pinctrl include pinctrl: mvebu: dove: provide generic mpp callbacks pinctrl: mvebu: kirkwood: provide generic mpp callbacks pinctrl: mvebu: armada-370: provide generic mpp callbacks pinctrl: mvebu: armada-xp: provide generic mpp callbacks pinctrl: mvebu: move resource allocation to SoC specific drivers pinctrl: mvebu: remove common get/set functions pinctrl: mvebu: dove: consolidate auto-numbered pmu mpp ranges pinctrl: mvebu: dove: reuse mpp_{set,get} in pmu callbacks devicetree: bindings: add missing Marvell Dove SoC documentation devicetree: bindings: update MVEBU pinctrl binding documentation ARM: dove: add additional pinctrl registers ARM: dove: add global-config register node pinctrl: mvebu: dove: request additional resources pinctrl: mvebu: dove: request syscon regmap for global registers pinctrl: mvebu: dove: use remapped mpp base registers pinctrl: mvebu: dove: use remapped mpp4 register pinctrl: mvebu: dove: use remapped pmu_mpp registers pinctrl: mvebu: dove: use global register regmap Thomas Petazzoni (3): pinctrl: mvebu: remove MPP_REG_CTRL macro pinctrl: mvebu: add pin-muxing driver for the Marvell Armada 375 pinctrl: mvebu: add pin-muxing driver for the Marvell Armada 380/385 .../devicetree/bindings/arm/marvell,dove.txt | 22 + .../pinctrl/marvell,armada-370-pinctrl.txt | 1 + .../pinctrl/marvell,armada-375-pinctrl.txt | 82 ++++ .../pinctrl/marvell,armada-38x-pinctrl.txt | 80 ++++ .../bindings/pinctrl/marvell,armada-xp-pinctrl.txt | 1 + .../bindings/pinctrl/marvell,dove-pinctrl.txt | 1 + .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt | 1 + .../bindings/pinctrl/marvell,mvebu-pinctrl.txt | 2 +- arch/arm/boot/dts/dove.dtsi | 10 +- drivers/pinctrl/mvebu/Kconfig | 9 + drivers/pinctrl/mvebu/Makefile | 2 + drivers/pinctrl/mvebu/pinctrl-armada-370.c | 20 +- drivers/pinctrl/mvebu/pinctrl-armada-375.c | 459 ++++++++++++++++++++ drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 462 +++++++++++++++++++++ drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 24 +- drivers/pinctrl/mvebu/pinctrl-dove.c | 403 ++++++++++-------- drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 25 +- drivers/pinctrl/mvebu/pinctrl-mvebu.c | 122 ++---- drivers/pinctrl/mvebu/pinctrl-mvebu.h | 55 ++- 19 files changed, 1489 insertions(+), 292 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/marvell,dove.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,armada-38x-pinctrl.txt create mode 100644 drivers/pinctrl/mvebu/pinctrl-armada-375.c create mode 100644 drivers/pinctrl/mvebu/pinctrl-armada-38x.c