From: Antoine Tenart <antoine.tenart@free-electrons.com>
To: Jisheng Zhang <jszhang@marvell.com>
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()
Date: Fri, 9 Oct 2015 11:04:43 +0200 [thread overview]
Message-ID: <20151009090443.GB2842@kwain> (raw)
In-Reply-To: <1444378629-3057-2-git-send-email-jszhang@marvell.com>
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 <jszhang@marvell.com>
Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>
> ---
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2015-10-09 9:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-09 8:17 [PATCH v4 0/6] arm64: berlin: add pinctrl support Jisheng Zhang
2015-10-09 8:17 ` [PATCH v4 1/6] pinctrl: berlin: introduce berlin_pinctrl_probe_regmap() Jisheng Zhang
2015-10-09 9:04 ` Antoine Tenart [this message]
2015-10-09 8:17 ` [PATCH v4 2/6] pinctrl: berlin: add the berlin4ct pinctrl driver Jisheng Zhang
2015-10-09 9:03 ` Antoine Tenart
2015-10-09 9:22 ` Jisheng Zhang
2015-10-10 22:33 ` Antoine Tenart
2015-10-09 8:17 ` [PATCH v4 3/6] arm64: berlin: add the pinctrl dependency for Marvell Berlin SoCs Jisheng Zhang
2015-10-09 9:05 ` Antoine Tenart
2015-10-09 8:17 ` [PATCH v4 4/6] pinctrl: dt-binding: document berlin4ct SoC pinctrl Jisheng Zhang
2015-10-09 9:05 ` Antoine Tenart
2015-10-09 8:17 ` [PATCH v4 5/6] arm64: dts: berlin4ct: add the pinctrl node Jisheng Zhang
2015-10-09 9:06 ` Antoine Tenart
2015-10-09 8:17 ` [PATCH v4 6/6] arm64: dts: berlin4ct: add default pinmux for uart0 Jisheng Zhang
2015-10-09 9:07 ` Antoine Tenart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151009090443.GB2842@kwain \
--to=antoine.tenart@free-electrons.com \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jszhang@marvell.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).