From: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
To: Sebastian Reichel <sre@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>,
Steven Miao <realmz6@gmail.com>
Cc: Vladimir Zapolskiy <vz@mleia.com>,
Sylvain Lemieux <slemieux.tyco@gmail.com>,
Enric Balletbo i Serra <enric.balletbo@collabora.co.uk>,
linux-gpio@vger.kernel.org,
adi-buildroot-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org,
Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Subject: [PATCHv2 6/6] pinctrl: mcp23s08: drop pullup config from pdata
Date: Thu, 27 Apr 2017 16:19:37 +0200 [thread overview]
Message-ID: <20170427141937.762-7-sebastian.reichel@collabora.co.uk> (raw)
In-Reply-To: <20170427141937.762-1-sebastian.reichel@collabora.co.uk>
mcp23s08 support configuration of the pullups using the
pinconf framework. This removes the custom pullup configuration
from platform data, which has no upstream users.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
---
drivers/pinctrl/pinctrl-mcp23s08.c | 7 -------
include/linux/spi/mcp23s08.h | 1 -
2 files changed, 8 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
index 8aacedcf814c..7fad3a9e2222 100644
--- a/drivers/pinctrl/pinctrl-mcp23s08.c
+++ b/drivers/pinctrl/pinctrl-mcp23s08.c
@@ -782,11 +782,6 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
goto fail;
}
- /* configure ~100K pullups */
- ret = mcp_write(mcp, MCP_GPPU, pdata->chip[cs].pullups);
- if (ret < 0)
- goto fail;
-
ret = mcp_update_cache(mcp);
if (ret < 0)
goto fail;
@@ -911,7 +906,6 @@ static int mcp230xx_probe(struct i2c_client *client,
if (match) {
pdata = &local_pdata;
pdata->base = -1;
- pdata->chip[0].pullups = 0;
pdata->irq_controller = of_property_read_bool(
client->dev.of_node,
"interrupt-controller");
@@ -1031,7 +1025,6 @@ static int mcp23s08_probe(struct spi_device *spi)
pdata = &local_pdata;
pdata->base = -1;
for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++) {
- pdata->chip[addr].pullups = 0;
if (spi_present_mask & (1 << addr))
chips++;
}
diff --git a/include/linux/spi/mcp23s08.h b/include/linux/spi/mcp23s08.h
index aa07d7b32568..080ecc6bb270 100644
--- a/include/linux/spi/mcp23s08.h
+++ b/include/linux/spi/mcp23s08.h
@@ -3,7 +3,6 @@
struct mcp23s08_chip_info {
bool is_present; /* true if populated */
- unsigned pullups; /* BIT(x) means enable pullup x */
};
struct mcp23s08_platform_data {
--
2.11.0
next prev parent reply other threads:[~2017-04-27 14:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-27 14:19 [PATCHv2 0/6] mcp23s08 pinconf support Sebastian Reichel
2017-04-27 14:19 ` [PATCHv2 1/6] gpio: mcp23s08: move to pinctrl Sebastian Reichel
2017-04-27 14:19 ` [PATCHv2 2/6] blackfin: boards: MCP23S08 config has been renamed Sebastian Reichel
2017-04-27 14:19 ` [PATCHv2 3/6] blackfin: defconfig: " Sebastian Reichel
2017-04-27 14:19 ` [PATCHv2 4/6] arm: lpc32xx: " Sebastian Reichel
2017-04-27 14:19 ` [PATCHv2 5/6] pinctrl: mcp23s08: add pinconf support Sebastian Reichel
2017-05-10 14:39 ` Enric Balletbo i Serra
2017-04-27 14:19 ` Sebastian Reichel [this message]
2017-04-28 8:22 ` [PATCHv2 0/6] mcp23s08 " Linus Walleij
2017-04-28 8:43 ` Sebastian Reichel
2017-05-11 13:38 ` Linus Walleij
2017-05-19 8:20 ` Arnd Bergmann
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=20170427141937.762-7-sebastian.reichel@collabora.co.uk \
--to=sebastian.reichel@collabora.co.uk \
--cc=adi-buildroot-devel@lists.sourceforge.net \
--cc=enric.balletbo@collabora.co.uk \
--cc=gnurou@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=realmz6@gmail.com \
--cc=slemieux.tyco@gmail.com \
--cc=sre@kernel.org \
--cc=vz@mleia.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).