G'day Marco,
On 25/09/2018 10:56 PM, Marco Felsch wrote:
This patch fixes 'commit 9b3e4207661e ("pinctrl: mcp23s08: spi: Fix regmap debugfs entries")'. For sure the MCP23S18 device has only 1 address pin but this will get decoded into three internally ([1], section 1.4).
[1] http://ww1.microchip.com/downloads/en/DeviceDoc/22103a.pdf
The MCP23018 (i2c) has an address pin that's decoded to 8 addresses. The spi MCP23s18 does not from what I can see.
reference: TABLE 1-2: SPI PINOUT DESCRIPTION (MCP23S18)
and
1.4 Multi-bit Address Decoder The ADDR pin is used to set the slave address of the MCP23018 (I2C only) to allow up to eight devices on the bus using only a
So I think the original code is correct.
Cc: stable@vger.kernel.org Cc: Jan Kundrát jan.kundrat@cesnet.cz Fixes: 9b3e4207661e ('pinctrl: mcp23s08: spi: Fix regmap debugfs entries') Signed-off-by: Marco Felsch m.felsch@pengutronix.de
drivers/pinctrl/pinctrl-mcp23s08.c | 49 ++++++++++++++---------------- 1 file changed, 23 insertions(+), 26 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-mcp23s08.c b/drivers/pinctrl/pinctrl-mcp23s08.c index 4a8a8efadefa..472746931ea8 100644 --- a/drivers/pinctrl/pinctrl-mcp23s08.c +++ b/drivers/pinctrl/pinctrl-mcp23s08.c @@ -794,41 +794,38 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev, switch (type) { #ifdef CONFIG_SPI_MASTER case MCP_TYPE_S08:
- case MCP_TYPE_S17:
switch (type) {case MCP_TYPE_S08:one_regmap_config =devm_kmemdup(dev, &mcp23x08_regmap,sizeof(struct regmap_config), GFP_KERNEL);mcp->reg_shift = 0;mcp->chip.ngpio = 8;mcp->chip.label = devm_kasprintf(dev, GFP_KERNEL,"mcp23s08.%d", raw_chip_address);break;case MCP_TYPE_S17:one_regmap_config =devm_kmemdup(dev, &mcp23x17_regmap,sizeof(struct regmap_config), GFP_KERNEL);mcp->reg_shift = 1;mcp->chip.ngpio = 16;mcp->chip.label = devm_kasprintf(dev, GFP_KERNEL,"mcp23s17.%d", raw_chip_address);break;}
one_regmap_config = devm_kmemdup(dev, &mcp23x08_regmap,sizeof(struct regmap_config),GFP_KERNEL);
one_regmap_config->name = devm_kasprintf(dev, GFP_KERNEL, "%d", raw_chip_address);
mcp->reg_shift = 0;mcp->chip.ngpio = 8;mcp->chip.label = devm_kasprintf(dev, GFP_KERNEL, "mcp23s08.%d",raw_chip_address);one_regmap_config->name = devm_kasprintf(dev, GFP_KERNEL, "%d",raw_chip_address);
- case MCP_TYPE_S17: case MCP_TYPE_S18:
mcp->regmap = devm_regmap_init(dev, &mcp23sxx_spi_regmap, mcp,&mcp23x17_regmap);
one_regmap_config = devm_kmemdup(dev, &mcp23x17_regmap,sizeof(struct regmap_config),GFP_KERNEL);if (!one_regmap_config)return -ENOMEM;- mcp->reg_shift = 1; mcp->chip.ngpio = 16;
mcp->chip.label = "mcp23s18";
mcp->chip.label = devm_kasprintf(dev, GFP_KERNEL, "mcp23s%s.%d",type == MCP_TYPE_S17 ?"17" : "18", raw_chip_address);one_regmap_config->name = devm_kasprintf(dev, GFP_KERNEL, "%d",raw_chip_address);mcp->regmap = devm_regmap_init(dev, &mcp23sxx_spi_regmap, mcp,one_regmap_config);