pinctrl: mcp23s08: drop pullup config from pdata

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>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c
index d957c4bbc8c1840a152a7e841cd4fe6b0c39f808..8c684d179e29a7be133e2e34b752a1fee00c1ff9 100644 (file)
--- 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 aa07d7b32568b920bd62a08d03a28d4517e00a58..080ecc6bb2708b3aa62419eaf73f2331ffc3af73 100644 (file)
--- 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 {