Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d795cb51 authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Linus Walleij
Browse files

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: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 82039d24

drivers/pinctrl/pinctrl-mcp23s08.c

+0 −7
Original line number Diff line number Diff line
@@ -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++;

		}

include/linux/spi/mcp23s08.h

+0 −1
Original line number Diff line number Diff line
@@ -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 {