Skip to content

mcp23s17 fixes #6769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: rpi-6.12.y
Choose a base branch
from
Open

mcp23s17 fixes #6769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbc57c3
dtoverlays: Add gpio-ranges to the mcp23017 and mcp23s17 overlays
6by9 Apr 3, 2025
74d6e84
pinctrl: mcp23s08: Register pinctrl before gpiochip
6by9 Apr 3, 2025
dccfabb
pinctrl: mcp23s08: Provide a gpiochip set_config function
6by9 Apr 3, 2025
2631f6f
pinctrl: mcp23s08: Add support for PIN_CONFIG_BIAS_DISABLE
6by9 Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/arm/boot/dts/overlays/mcp23017-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
#gpio-cells = <2>;

status = "okay";
gpio-ranges = <&mcp23017 0 0 16>;
};
};
};
Expand Down
32 changes: 32 additions & 0 deletions arch/arm/boot/dts/overlays/mcp23s17-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi0-0-int-gpio parameter */

gpio-ranges = <&mcp23s08_00 0 0 16>;
};
};
};
Expand All @@ -124,6 +126,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi0-1-int-gpio parameter */

gpio-ranges = <&mcp23s08_01 0 0 16>;
};
};
};
Expand All @@ -145,6 +149,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi1-0-int-gpio parameter */

gpio-ranges = <&mcp23s08_10 0 0 16>;
};
};
};
Expand All @@ -166,6 +172,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi1-1-int-gpio parameter */

gpio-ranges = <&mcp23s08_11 0 0 16>;
};
};
};
Expand All @@ -187,6 +195,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi1-2-int-gpio parameter */

gpio-ranges = <&mcp23s08_12 0 0 16>;
};
};
};
Expand All @@ -208,6 +218,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi2-0-int-gpio parameter */

gpio-ranges = <&mcp23s08_20 0 0 16>;
};
};
};
Expand All @@ -229,6 +241,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi2-1-int-gpio parameter */

gpio-ranges = <&mcp23s08_21 0 0 16>;
};
};
};
Expand All @@ -250,6 +264,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s08-spi2-2-int-gpio parameter */

gpio-ranges = <&mcp23s08_22 0 0 16>;
};
};
};
Expand All @@ -271,6 +287,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi0-0-int-gpio parameter */

gpio-ranges = <&mcp23s17_00 0 0 16>;
};
};
};
Expand All @@ -292,6 +310,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi0-1-int-gpio parameter */

gpio-ranges = <&mcp23s17_01 0 0 16>;
};
};
};
Expand All @@ -313,6 +333,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi1-0-int-gpio parameter */

gpio-ranges = <&mcp23s17_10 0 0 16>;
};
};
};
Expand All @@ -334,6 +356,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi1-1-int-gpio parameter */

gpio-ranges = <&mcp23s17_11 0 0 16>;
};
};
};
Expand All @@ -355,6 +379,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi1-2-int-gpio parameter */

gpio-ranges = <&mcp23s17_12 0 0 16>;
};
};
};
Expand All @@ -376,6 +402,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi2-0-int-gpio parameter */

gpio-ranges = <&mcp23s17_20 0 0 16>;
};
};
};
Expand All @@ -397,6 +425,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi2-1-int-gpio parameter */

gpio-ranges = <&mcp23s17_21 0 0 16>;
};
};
};
Expand All @@ -418,6 +448,8 @@
status = "okay";
#interrupt-cells=<2>;
interrupts = <0 2>; /* 1st word overwritten by mcp23s17-spi2-2-int-gpio parameter */

gpio-ranges = <&mcp23s17_22 0 0 16>;
};
};
};
Expand Down
15 changes: 11 additions & 4 deletions drivers/pinctrl/pinctrl-mcp23s08.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ static int mcp_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin,

switch (param) {
case PIN_CONFIG_BIAS_PULL_UP:
case PIN_CONFIG_BIAS_DISABLE:
mutex_lock(&mcp->lock);
ret = mcp_read(mcp, MCP_GPPU, &data);
mutex_unlock(&mcp->lock);
Expand Down Expand Up @@ -265,6 +266,11 @@ static int mcp_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
ret = mcp_set_bit(mcp, MCP_GPPU, pin, arg);
mutex_unlock(&mcp->lock);
break;
case PIN_CONFIG_BIAS_DISABLE:
mutex_lock(&mcp->lock);
ret = mcp_set_bit(mcp, MCP_GPPU, pin, 0);
mutex_unlock(&mcp->lock);
break;
default:
dev_dbg(mcp->dev, "Invalid config param %04x\n", param);
return -ENOTSUPP;
Expand Down Expand Up @@ -610,6 +616,7 @@ int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
mcp->chip.get_multiple = mcp23s08_get_multiple;
mcp->chip.direction_output = mcp23s08_direction_output;
mcp->chip.set = mcp23s08_set;
mcp->chip.set_config = gpiochip_generic_config;
mcp->chip.set_multiple = mcp23s08_set_multiple;

mcp->chip.base = base;
Expand Down Expand Up @@ -675,10 +682,6 @@ int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
girq->threaded = true;
}

ret = devm_gpiochip_add_data(dev, &mcp->chip, mcp);
if (ret < 0)
return dev_err_probe(dev, ret, "can't add GPIO chip\n");

mcp->pinctrl_desc.pctlops = &mcp_pinctrl_ops;
mcp->pinctrl_desc.confops = &mcp_pinconf_ops;
mcp->pinctrl_desc.npins = mcp->chip.ngpio;
Expand All @@ -692,6 +695,10 @@ int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,
if (IS_ERR(mcp->pctldev))
return dev_err_probe(dev, PTR_ERR(mcp->pctldev), "can't register controller\n");

ret = devm_gpiochip_add_data(dev, &mcp->chip, mcp);
if (ret < 0)
return dev_err_probe(dev, ret, "can't add GPIO chip\n");

if (mcp->irq) {
ret = mcp23s08_irq_setup(mcp);
if (ret)
Expand Down