浏览代码

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>
Sebastian Reichel 8 年之前
父节点
当前提交
d795cb51df
共有 2 个文件被更改,包括 0 次插入8 次删除
  1. 0 7
      drivers/pinctrl/pinctrl-mcp23s08.c
  2. 0 1
      include/linux/spi/mcp23s08.h

+ 0 - 7
drivers/pinctrl/pinctrl-mcp23s08.c

@@ -782,11 +782,6 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
 			goto fail;
 			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);
 	ret = mcp_update_cache(mcp);
 	if (ret < 0)
 	if (ret < 0)
 		goto fail;
 		goto fail;
@@ -911,7 +906,6 @@ static int mcp230xx_probe(struct i2c_client *client,
 	if (match) {
 	if (match) {
 		pdata = &local_pdata;
 		pdata = &local_pdata;
 		pdata->base = -1;
 		pdata->base = -1;
-		pdata->chip[0].pullups = 0;
 		pdata->irq_controller =	of_property_read_bool(
 		pdata->irq_controller =	of_property_read_bool(
 					client->dev.of_node,
 					client->dev.of_node,
 					"interrupt-controller");
 					"interrupt-controller");
@@ -1031,7 +1025,6 @@ static int mcp23s08_probe(struct spi_device *spi)
 		pdata = &local_pdata;
 		pdata = &local_pdata;
 		pdata->base = -1;
 		pdata->base = -1;
 		for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++) {
 		for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++) {
-			pdata->chip[addr].pullups = 0;
 			if (spi_present_mask & (1 << addr))
 			if (spi_present_mask & (1 << addr))
 				chips++;
 				chips++;
 		}
 		}

+ 0 - 1
include/linux/spi/mcp23s08.h

@@ -3,7 +3,6 @@
 
 
 struct mcp23s08_chip_info {
 struct mcp23s08_chip_info {
 	bool		is_present;	/* true if populated */
 	bool		is_present;	/* true if populated */
-	unsigned	pullups;	/* BIT(x) means enable pullup x */
 };
 };
 
 
 struct mcp23s08_platform_data {
 struct mcp23s08_platform_data {