From: Linus Walleij <linus.walleij@linaro.org>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: linux-gpio@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH 5/7] pinctrl: abx500: retire phandle config mechanism
Date: Thu, 2 Oct 2014 10:40:18 +0200 [thread overview]
Message-ID: <1412239220-22495-6-git-send-email-linus.walleij@linaro.org> (raw)
In-Reply-To: <1412239220-22495-1-git-send-email-linus.walleij@linaro.org>
The abx500 pin control driver supported a method of fetching the
generic config from a phandle to a separate node using the
"ste,config" as a phandle. This is not used in any device trees
and not documented in the bindings, so drop this support.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/pinctrl/nomadik/pinctrl-abx500.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c
index 93ded6e0e21a..3b3fbb4c21c9 100644
--- a/drivers/pinctrl/nomadik/pinctrl-abx500.c
+++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c
@@ -892,9 +892,7 @@ static int abx500_dt_subnode_to_map(struct pinctrl_dev *pctldev,
const char *function = NULL;
unsigned long *configs;
unsigned int nconfigs = 0;
- bool has_config = 0;
struct property *prop;
- struct device_node *np_config;
ret = of_property_read_string(np, "function", &function);
if (ret >= 0) {
@@ -918,17 +916,7 @@ static int abx500_dt_subnode_to_map(struct pinctrl_dev *pctldev,
}
ret = pinconf_generic_parse_dt_config(np, &configs, &nconfigs);
- if (nconfigs)
- has_config = 1;
- np_config = of_parse_phandle(np, "ste,config", 0);
- if (np_config) {
- ret = pinconf_generic_parse_dt_config(np_config, &configs,
- &nconfigs);
- if (ret)
- goto exit;
- has_config |= nconfigs;
- }
- if (has_config) {
+ if (nconfigs) {
const char *gpio_name;
const char *pin;
--
1.9.3
next prev parent reply other threads:[~2014-10-02 8:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-02 8:40 [PATCH 0/7] pinctrl: force-convert to generic DT bindings Linus Walleij
2014-10-02 8:40 ` [PATCH 1/7] pinctrl: nomadik: force-convert to generic mux bindings Linus Walleij
2014-10-02 8:40 ` [PATCH 2/7] pinctrl: abx500: " Linus Walleij
2014-10-02 8:40 ` [PATCH 3/7] pinctrl: nomadik: force-convert to generic config bindings Linus Walleij
2014-10-02 8:40 ` [PATCH 4/7] pinctrl: abx500: " Linus Walleij
2014-10-02 8:40 ` Linus Walleij [this message]
2014-10-02 8:40 ` [PATCH 6/7] pinctrl: abx500: update device tree bindings Linus Walleij
2014-10-02 8:40 ` [PATCH 7/7] pinctrl: abx500: mark pin config as generic Linus Walleij
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=1412239220-22495-6-git-send-email-linus.walleij@linaro.org \
--to=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).