From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755854AbbJIJE6 (ORCPT ); Fri, 9 Oct 2015 05:04:58 -0400 Received: from down.free-electrons.com ([37.187.137.238]:53556 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755078AbbJIJE4 (ORCPT ); Fri, 9 Oct 2015 05:04:56 -0400 Date: Fri, 9 Oct 2015 11:04:43 +0200 From: Antoine Tenart To: Jisheng Zhang Cc: sebastian.hesselbarth@gmail.com, linus.walleij@linaro.org, antoine.tenart@free-electrons.com, catalin.marinas@arm.com, will.deacon@arm.com, mark.rutland@arm.com, robh+dt@kernel.org, pawel.moll@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v4 1/6] pinctrl: berlin: introduce berlin_pinctrl_probe_regmap() Message-ID: <20151009090443.GB2842@kwain> References: <1444378629-3057-1-git-send-email-jszhang@marvell.com> <1444378629-3057-2-git-send-email-jszhang@marvell.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1444378629-3057-2-git-send-email-jszhang@marvell.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Oct 09, 2015 at 04:17:04PM +0800, Jisheng Zhang wrote: > This is to prepare for the next berlin4ct support, where we won't use > simple-mfd any more. > > Signed-off-by: Jisheng Zhang Acked-by: Antoine Tenart > --- > drivers/pinctrl/berlin/berlin.c | 26 +++++++++++++++++--------- > drivers/pinctrl/berlin/berlin.h | 4 ++++ > 2 files changed, 21 insertions(+), 9 deletions(-) > > diff --git a/drivers/pinctrl/berlin/berlin.c b/drivers/pinctrl/berlin/berlin.c > index f495806..898afa4 100644 > --- a/drivers/pinctrl/berlin/berlin.c > +++ b/drivers/pinctrl/berlin/berlin.c > @@ -292,20 +292,14 @@ static struct pinctrl_desc berlin_pctrl_desc = { > .owner = THIS_MODULE, > }; > > -int berlin_pinctrl_probe(struct platform_device *pdev, > - const struct berlin_pinctrl_desc *desc) > +int berlin_pinctrl_probe_regmap(struct platform_device *pdev, > + const struct berlin_pinctrl_desc *desc, > + struct regmap *regmap) > { > struct device *dev = &pdev->dev; > - struct device_node *parent_np = of_get_parent(dev->of_node); > struct berlin_pinctrl *pctrl; > - struct regmap *regmap; > int ret; > > - regmap = syscon_node_to_regmap(parent_np); > - of_node_put(parent_np); > - if (IS_ERR(regmap)) > - return PTR_ERR(regmap); > - > pctrl = devm_kzalloc(dev, sizeof(*pctrl), GFP_KERNEL); > if (!pctrl) > return -ENOMEM; > @@ -330,3 +324,17 @@ int berlin_pinctrl_probe(struct platform_device *pdev, > > return 0; > } > + > +int berlin_pinctrl_probe(struct platform_device *pdev, > + const struct berlin_pinctrl_desc *desc) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *parent_np = of_get_parent(dev->of_node); > + struct regmap *regmap = syscon_node_to_regmap(parent_np); > + > + of_node_put(parent_np); > + if (IS_ERR(regmap)) > + return PTR_ERR(regmap); > + > + return berlin_pinctrl_probe_regmap(pdev, desc, regmap); > +} > diff --git a/drivers/pinctrl/berlin/berlin.h b/drivers/pinctrl/berlin/berlin.h > index e1aa841..dabbd2a 100644 > --- a/drivers/pinctrl/berlin/berlin.h > +++ b/drivers/pinctrl/berlin/berlin.h > @@ -58,4 +58,8 @@ struct berlin_pinctrl_function { > int berlin_pinctrl_probe(struct platform_device *pdev, > const struct berlin_pinctrl_desc *desc); > > +int berlin_pinctrl_probe_regmap(struct platform_device *pdev, > + const struct berlin_pinctrl_desc *desc, > + struct regmap *regmap); > + > #endif /* __PINCTRL_BERLIN_H */ > -- > 2.6.1 > -- Antoine Ténart, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com