Skip to content

pinctrl: rp1: enable strict pinmux mode #7522

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
nbuchwitz wants to merge 3 commits into
base: rpi-6.18.y
Choose a base branch
from
+12 −5
Open

pinctrl: rp1: enable strict pinmux mode #7522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9118ca
arm64: dts: rp1: Mux SPI chip-select pins as GPIO
nbuchwitz Jul 28, 2026
98ef53c
pinctrl: rp1: enable strict pinmux mode
nbuchwitz Jul 25, 2026
f0d34ae
pinctrl: rp1: Fix node leak and mapping check in probe
nbuchwitz Jul 25, 2026
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
4 changes: 2 additions & 2 deletions arch/arm64/boot/dts/broadcom/rp1.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@
};

rp1_spi0_cs_gpio7: rp1_spi0_cs_gpio7 {
function = "spi0";
function = "gpio";
pins = "gpio7", "gpio8";
bias-pull-up;
};
Expand Down Expand Up @@ -984,7 +984,7 @@
};

rp1_spi8_cs_gpio52: rp1_spi8_cs_gpio52 {
function = "spi0";
function = "gpio";
pins = "gpio52", "gpio53";
bias-pull-up;
};
Expand Down
13 changes: 10 additions & 3 deletions drivers/pinctrl/pinctrl-rp1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1333,6 +1333,12 @@ static int rp1_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,
return 0;
}

static bool rp1_pmx_function_is_gpio(struct pinctrl_dev *pctldev,
unsigned int selector)
{
return selector == func_gpio;
}

static const struct pinmux_ops rp1_pmx_ops = {
.free = rp1_pmx_free,
.get_functions_count = rp1_pmx_get_functions_count,
Expand All @@ -1341,6 +1347,8 @@ static const struct pinmux_ops rp1_pmx_ops = {
.set_mux = rp1_pmx_set,
.gpio_disable_free = rp1_pmx_gpio_disable_free,
.gpio_set_direction = rp1_pmx_gpio_set_direction,
.function_is_gpio = rp1_pmx_function_is_gpio,
.strict = true,
};

static void rp1_pull_config_set(struct rp1_pin_info *pin, unsigned int arg)
Expand Down Expand Up @@ -1604,11 +1612,10 @@ static int rp1_pinctrl_probe(struct platform_device *pdev)
else if (pace_pin_updates &&
of_device_is_compatible(rp1_node->parent, "brcm,bcm2712-pcie")) {
pc->dummy_base = of_iomap(rp1_node->parent, 0);
if (IS_ERR(pc->dummy_base)) {
if (!pc->dummy_base)
dev_warn(&pdev->dev, "could not map bcm2712 root complex registers\n");
pc->dummy_base = NULL;
}
}
of_node_put(rp1_node);

for (i = 0; i < RP1_NUM_BANKS; i++) {
const struct rp1_iobank_desc *bank = &rp1_iobanks[i];
Expand Down