From patchwork Tue Feb 25 20:04:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 3718771 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 8BC3BBF13A for ; Tue, 25 Feb 2014 20:05:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 99909201ED for ; Tue, 25 Feb 2014 20:05:39 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7B48C201EC for ; Tue, 25 Feb 2014 20:05:38 +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 1WIOFj-0001wf-Vu; Tue, 25 Feb 2014 20:05:20 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIOFh-0005wU-Jz; Tue, 25 Feb 2014 20:05:17 +0000 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIOFd-0005vQ-Il for linux-arm-kernel@lists.infradead.org; Tue, 25 Feb 2014 20:05:14 +0000 Received: from pool-108-39-110-144.nrflva.fios.verizon.net ([108.39.110.144] helo=titan) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1WIOFH-00063C-6J; Tue, 25 Feb 2014 20:04:51 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id 3F82E533CE6; Tue, 25 Feb 2014 15:04:47 -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: U2FsdGVkX1+spdmbOTU8qJWiQkBojNoyPWl8RgfxXCs= X-DKIM: OpenDKIM Filter v2.0.1 titan 3F82E533CE6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lakedaemon.net; s=mail; t=1393358687; bh=7uKeQ3JeR9cFLkQMQmMYO7y3Qwa1Nl3eYEiM1LJQMPU=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:In-Reply-To; b=WYvM7eZatJF/O08amEqsJ6yvGvzU1pIEKzgVzTr9oirihYtE8J/6m74Djrq/KxW3R zD80J8YCRaLms2gIscIZC7lNAFRYrrVbklWA/mC5LPX+R37epCQ++Jptm3lwULitgP //34oqRxKUuFLiDosFHrxIHTZT+RX6crSRTJU0UW9o7imE0nwiwnnHiodd2+8Fv3Sx KhyhNFD/YEO2W302/TjSchC1mahZLB8EuElkP12cELOi0i4gYlYw0RN08sTfizErk1 tnjueujrul2fPl6bWnYzriTsfg70X/VOxrXYLxKVPCy6ui7aHZm2llgUf1WnQ6i/BV CIFBmoV5FtH5g== Date: Tue, 25 Feb 2014 15:04:47 -0500 From: Jason Cooper To: Sebastian Hesselbarth Subject: Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Message-ID: <20140225200447.GA1872@titan.lakedaemon.net> References: <1393231382-11078-1-git-send-email-sebastian.hesselbarth@gmail.com> <20140224181023.GA1010@titan.lakedaemon.net> <20140225151656.GI1010@titan.lakedaemon.net> <530CB725.5070904@gmail.com> <20140225154347.GJ1010@titan.lakedaemon.net> <530CEDB7.2070103@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <530CEDB7.2070103@gmail.com> 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-20140225_150513_660208_27865BAF X-CRM114-Status: GOOD ( 25.13 ) X-Spam-Score: -2.0 (--) Cc: Thomas Petazzoni , Andrew Lunn , Linus Walleij , "linux-kernel@vger.kernel.org" , Ezequiel Garcia , Gregory Clement , "linux-arm-kernel@lists.infradead.org" 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 Sebastian, On Tue, Feb 25, 2014 at 08:23:35PM +0100, Sebastian Hesselbarth wrote: > [Cooked down Cc list to relevant people and added Ezequiel who agreed > to test on Armada 375/38x.] > > On 02/25/2014 04:43 PM, Jason Cooper wrote: > >On Tue, Feb 25, 2014 at 04:30:45PM +0100, Sebastian Hesselbarth wrote: > >>On 02/25/14 16:16, Jason Cooper wrote: > >>>On Tue, Feb 25, 2014 at 10:36:54AM +0100, Linus Walleij wrote: > >>>>On Mon, Feb 24, 2014 at 7:10 PM, Jason Cooper wrote: > >>>>>I've now created mvebu/pinctrl-dove for this series. It's based on > >>>>>v3.14-rc1, and depends on mvebu/pinctrl (which depends on > >>>>>mvebu/pinctrl-3xx). > >>>>> > >>>>>I've kept this series in a separate branch in case we encounter an > >>>>>unforeseen problem with something in here. Then this branch can be > >>>>>dropped, and /pinctrl-3xx and /pinctrl will still make it in. > >>>>> > >>>>>So, all patches except 3 and 4 are in mvebu/pinctrl-dove. 3 and 4 are > >>>>>in mvebu/dt. > >>>> > >>>>OK so what should I be pulling in first now? > >>> > >>>Of course I woke up this morning not happy with this :-/ Here's what it > >>>looks like currently: > >>> > >>> /v3.14-rc1 > >>> | > >>>--+---+---+---+---+ mvebu/pinctrl-3xx > >>> | \ > >>> |---+---+---+---+---+---+---+ mvebu/pinctrl > >>> \ \ > >>> \---------------------------+---+---+---+ mvebu/pinctrl-dove > >>> > >>>Not to scale. > >>> > >>> > >>>I would prefer to do: > >>> > >>> /v3.14-rc1 > >>> | > >>>--+---+---+---+---+ mvebu/pinctrl-cleanup > >>> | \ > >>> |----------------+--+---+---+ mvebu/pinctrl-3xx > >>> \ \ > >>> \----------------+---+---+--+---+---+---+ mvebu/pinctrl-dove > >>> > >>>But this would mean moving some patches to branches other than what they > >>>were sent with. The advantage is that /pinctrl-3xx and /pinctrl-dove > >>>don't depend on each other, and only depend on -cleanup. Which is great > >>>if there is something wrong in either branch. > >>> > >>>Sebastian, I can cherry-pick the patches around, but you know the code > >>>better than any of us, do you foresee any problems with this scenario? > >> > >>If Thomas agrees, I can rework Armada 375/38x pinctrl stubs to fit on > >>mvebu/pinctrl. That should allow you to have mvebu/pinctrl-dove > >>independent of mvebu/pinctrl-3xx. > >> > >>Not a big deal, I'd just pick 375/38x patches from mvebu/pinctrl and > >>squash them into mvebu/pinctrl-3xx. The only "issue" is that DT > >>documentation update patches from mvebu/pinctrl-dove have to be split > >>too. > >> > >>I'll prepare the three new branches for you and Thomas to look at > >>today. > > > >Ok, great. Thanks Sebastian! > > Ok, branches based on v3.14-rc1 with above dependencies can be found on: > > https://github.com/shesselba/linux-dove.git for-mvebu/pinctrl-cleanup > https://github.com/shesselba/linux-dove.git for-mvebu/pinctrl-3xx > https://github.com/shesselba/linux-dove.git for-mvebu/pinctrl-dove > > and an a-i-o branch to ease testing: > > https://github.com/shesselba/linux-dove.git for-mvebu/all-merged-in > > @Jason: I guess we should resend all three branches as individual > patches on list somehow. Damn! So close! $ git diff mvebu/pinctrl-dove shesselba/for-mvebu/all-merged-in If you can drop the dtsi changes (I have them in mvebu/dt), and fix the whitespace change, then we can merge them as is. Thanks a ton for handling this! thx, Jason. diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 2b76524f4aa7..eeb08edb67ac 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -390,7 +390,9 @@ pinctrl: pin-ctrl@d0200 { compatible = "marvell,dove-pinctrl"; - reg = <0xd0200 0x10>; + reg = <0xd0200 0x14>, + <0xd0440 0x04>, + <0xd802c 0x08>; clocks = <&gate_clk 22>; pmx_gpio_0: pmx-gpio-0 { @@ -614,6 +616,12 @@ interrupts = <5>; }; + gconf: global-config@e802c { + compatible = "marvell,dove-global-config", + "syscon"; + reg = <0xe802c 0x14>; + }; + gpio2: gpio-ctrl@e8400 { compatible = "marvell,orion-gpio"; #gpio-cells = <2>; diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c index 322ca8cb63eb..1049f82fb62f 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c @@ -428,7 +428,6 @@ static int armada_38x_pinctrl_probe(struct platform_device *pdev) return PTR_ERR(mpp_base); soc->variant = (unsigned) match->data & 0xff; - soc->controls = armada_38x_mpp_controls; soc->ncontrols = ARRAY_SIZE(armada_38x_mpp_controls); soc->gpioranges = armada_38x_mpp_gpio_ranges;