* [PATCH] pinctrl: capri: Make capri_pinctrl_probe static @ 2014-02-04 8:49 Axel Lin 2014-02-04 20:13 ` Sherman Yin 0 siblings, 1 reply; 6+ messages in thread From: Axel Lin @ 2014-02-04 8:49 UTC (permalink / raw) To: Linus Walleij; +Cc: Sherman Yin, linux-kernel Signed-off-by: Axel Lin <axel.lin@ingics.com> --- drivers/pinctrl/pinctrl-capri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-capri.c b/drivers/pinctrl/pinctrl-capri.c index 4669c53..b4aa8e3 100644 --- a/drivers/pinctrl/pinctrl-capri.c +++ b/drivers/pinctrl/pinctrl-capri.c @@ -1390,7 +1390,7 @@ static struct pinctrl_desc capri_pinctrl_desc = { .owner = THIS_MODULE, }; -int __init capri_pinctrl_probe(struct platform_device *pdev) +static int __init capri_pinctrl_probe(struct platform_device *pdev) { struct capri_pinctrl_data *pdata = &capri_pinctrl; struct resource *res; -- 1.8.1.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] pinctrl: capri: Make capri_pinctrl_probe static 2014-02-04 8:49 [PATCH] pinctrl: capri: Make capri_pinctrl_probe static Axel Lin @ 2014-02-04 20:13 ` Sherman Yin 2014-02-06 9:21 ` Linus Walleij 0 siblings, 1 reply; 6+ messages in thread From: Sherman Yin @ 2014-02-04 20:13 UTC (permalink / raw) To: Axel Lin, Linus Walleij; +Cc: linux-kernel, Christian Daudt On 14-02-04 12:49 AM, Axel Lin wrote: > Signed-off-by: Axel Lin <axel.lin@ingics.com> > --- > drivers/pinctrl/pinctrl-capri.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pinctrl/pinctrl-capri.c b/drivers/pinctrl/pinctrl-capri.c > index 4669c53..b4aa8e3 100644 > --- a/drivers/pinctrl/pinctrl-capri.c > +++ b/drivers/pinctrl/pinctrl-capri.c > @@ -1390,7 +1390,7 @@ static struct pinctrl_desc capri_pinctrl_desc = { > .owner = THIS_MODULE, > }; > > -int __init capri_pinctrl_probe(struct platform_device *pdev) > +static int __init capri_pinctrl_probe(struct platform_device *pdev) > { > struct capri_pinctrl_data *pdata = &capri_pinctrl; > struct resource *res; > Note that this will collide with the capri->bcm281xx renaming patches. Linus, Christian, are those patches going in soon? Thanks, Sherman ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] pinctrl: capri: Make capri_pinctrl_probe static 2014-02-04 20:13 ` Sherman Yin @ 2014-02-06 9:21 ` Linus Walleij 2014-02-07 18:35 ` Christian Daudt 0 siblings, 1 reply; 6+ messages in thread From: Linus Walleij @ 2014-02-06 9:21 UTC (permalink / raw) To: Sherman Yin; +Cc: Axel Lin, linux-kernel@vger.kernel.org, Christian Daudt On Tue, Feb 4, 2014 at 9:13 PM, Sherman Yin <syin@broadcom.com> wrote: > On 14-02-04 12:49 AM, Axel Lin wrote: >> >> Signed-off-by: Axel Lin <axel.lin@ingics.com> >> > Note that this will collide with the capri->bcm281xx renaming patches. > > Linus, Christian, are those patches going in soon? I have ACKed it, expecting it to be funneled through ARM SoC. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] pinctrl: capri: Make capri_pinctrl_probe static 2014-02-06 9:21 ` Linus Walleij @ 2014-02-07 18:35 ` Christian Daudt 2014-02-07 19:01 ` Christian Daudt 0 siblings, 1 reply; 6+ messages in thread From: Christian Daudt @ 2014-02-07 18:35 UTC (permalink / raw) To: Linus Walleij, Olof Johansson, Matt Porter Cc: Sherman Yin, Axel Lin, linux-kernel@vger.kernel.org On Thu, Feb 6, 2014 at 1:21 AM, Linus Walleij <linus.walleij@linaro.org> wrote: > On Tue, Feb 4, 2014 at 9:13 PM, Sherman Yin <syin@broadcom.com> wrote: >> On 14-02-04 12:49 AM, Axel Lin wrote: >>> >>> Signed-off-by: Axel Lin <axel.lin@ingics.com> >>> >> Note that this will collide with the capri->bcm281xx renaming patches. >> >> Linus, Christian, are those patches going in soon? > > I have ACKed it, expecting it to be funneled through ARM SoC. > > Yours, > Linus Walleij Linus, just to confirm. the bcm_defconfig portion is the only one going through armsoc right ? thanks, csd ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] pinctrl: capri: Make capri_pinctrl_probe static 2014-02-07 18:35 ` Christian Daudt @ 2014-02-07 19:01 ` Christian Daudt 2014-02-10 8:14 ` Linus Walleij 0 siblings, 1 reply; 6+ messages in thread From: Christian Daudt @ 2014-02-07 19:01 UTC (permalink / raw) To: Linus Walleij, Olof Johansson, Matt Porter Cc: Sherman Yin, Axel Lin, linux-kernel@vger.kernel.org On Fri, Feb 7, 2014 at 10:35 AM, Christian Daudt <bcm@fixthebug.org> wrote: > On Thu, Feb 6, 2014 at 1:21 AM, Linus Walleij <linus.walleij@linaro.org> wrote: >> On Tue, Feb 4, 2014 at 9:13 PM, Sherman Yin <syin@broadcom.com> wrote: >>> On 14-02-04 12:49 AM, Axel Lin wrote: >>>> >>>> Signed-off-by: Axel Lin <axel.lin@ingics.com> >>>> >>> Note that this will collide with the capri->bcm281xx renaming patches. >>> >>> Linus, Christian, are those patches going in soon? >> >> I have ACKed it, expecting it to be funneled through ARM SoC. >> >> Yours, >> Linus Walleij > > Linus, just to confirm. the bcm_defconfig portion is the only one > going through armsoc right ? > > thanks, > csd Linus, Sorry for the noise. I just had a chat with Olof on irc and it is probably best to revert to v1 and push a single patch through, either through pinctrl or armsoc. If you have further patches for 3.14 could you pull this one in along with it ? If not then I'll ask Olof to pull it in instead. thanks, csd ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] pinctrl: capri: Make capri_pinctrl_probe static 2014-02-07 19:01 ` Christian Daudt @ 2014-02-10 8:14 ` Linus Walleij 0 siblings, 0 replies; 6+ messages in thread From: Linus Walleij @ 2014-02-10 8:14 UTC (permalink / raw) To: Christian Daudt Cc: Olof Johansson, Matt Porter, Sherman Yin, Axel Lin, linux-kernel@vger.kernel.org On Fri, Feb 7, 2014 at 8:01 PM, Christian Daudt <bcm@fixthebug.org> wrote: > On Fri, Feb 7, 2014 at 10:35 AM, Christian Daudt <bcm@fixthebug.org> wrote: >> On Thu, Feb 6, 2014 at 1:21 AM, Linus Walleij <linus.walleij@linaro.org> wrote: >>> On Tue, Feb 4, 2014 at 9:13 PM, Sherman Yin <syin@broadcom.com> wrote: >>>> On 14-02-04 12:49 AM, Axel Lin wrote: >>>>> >>>>> Signed-off-by: Axel Lin <axel.lin@ingics.com> >>>>> >>>> Note that this will collide with the capri->bcm281xx renaming patches. >>>> >>>> Linus, Christian, are those patches going in soon? >>> >>> I have ACKed it, expecting it to be funneled through ARM SoC. >>> >>> Yours, >>> Linus Walleij >> >> Linus, just to confirm. the bcm_defconfig portion is the only one >> going through armsoc right ? >> >> thanks, >> csd > > Linus, > Sorry for the noise. I just had a chat with Olof on irc and it is > probably best to revert to v1 and push a single patch through, either > through pinctrl or armsoc. If you have further patches for 3.14 could > you pull this one in along with it ? If not then I'll ask Olof to pull > it in instead. Not quite following, I have ACKed the patches, so please push whatever changes you need done through ARM SoC as this is basically a device tree problem. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-02-10 8:14 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-02-04 8:49 [PATCH] pinctrl: capri: Make capri_pinctrl_probe static Axel Lin 2014-02-04 20:13 ` Sherman Yin 2014-02-06 9:21 ` Linus Walleij 2014-02-07 18:35 ` Christian Daudt 2014-02-07 19:01 ` Christian Daudt 2014-02-10 8:14 ` Linus Walleij
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox