Skip to content

gpios: Adapt to the upstream persist_gpio_outputs change #6150

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

Merged
merged 6 commits into from
May 7, 2024
Merged

gpios: Adapt to the upstream persist_gpio_outputs change #6150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c19079
Revert "pinctrl: bcm2835: Add strict_gpiod module parameter"
pelwell May 7, 2024
20ea588
Revert "pinctrl: bcm2835: Only return non-GPIOs to inputs"
pelwell May 7, 2024
fb0f561
pinctrl: bcm2835: Make pin freeing behavior configurable
lategoodbye May 3, 2024
ee91434
pinctrl: bcm2835: Persist outputs by default
pelwell May 7, 2024
9d09762
pinctrl: rp1: Use persist_gpio_outputs
pelwell May 7, 2024
8c4909d
ARM: dts: Update strict_gpiod dtparams
pelwell May 7, 2024
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
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/broadcom/bcm270x-rpi.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<&csi0>, "sync-gpios:4",
<&csi0>, "sync-gpios:8=0", <GPIO_ACTIVE_LOW>;

strict_gpiod = <&chosen>, "bootargs=pinctrl_bcm2835.strict_gpiod=y";
strict_gpiod = <&chosen>, "bootargs=pinctrl_bcm2835.persist_gpio_outputs=n";
};
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/broadcom/bcm2712-rpi.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
nvmem_cust_rw = <&nvmem_cust>,"rw?";
nvmem_priv_rw = <&nvmem_priv>,"rw?";
nvmem_mac_rw = <&nvmem_mac>,"rw?";
strict_gpiod = <&chosen>, "bootargs=pinctrl_rp1.strict_gpiod=y";
strict_gpiod = <&chosen>, "bootargs=pinctrl_rp1.persist_gpio_outputs=n";
};
};

Expand Down
21 changes: 14 additions & 7 deletions drivers/pinctrl/bcm/pinctrl-bcm2835.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,9 @@ static const char * const irq_type_names[] = {
[IRQ_TYPE_LEVEL_LOW] = "level-low",
};

static bool strict_gpiod;
module_param(strict_gpiod, bool, 0644);
MODULE_PARM_DESC(strict_gpiod, "unless true, outputs remain outputs when freed");
static bool persist_gpio_outputs = true;
module_param(persist_gpio_outputs, bool, 0644);
MODULE_PARM_DESC(persist_gpio_outputs, "Enable GPIO_OUT persistence when pin is freed");

static inline u32 bcm2835_gpio_rd(struct bcm2835_pinctrl *pc, unsigned reg)
{
Expand Down Expand Up @@ -945,10 +945,14 @@ static int bcm2835_pmx_free(struct pinctrl_dev *pctldev,
struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
enum bcm2835_fsel fsel = bcm2835_pinctrl_fsel_get(pc, offset);

/* Return non-GPIOs to GPIO_IN, unless strict_gpiod is set */
if (strict_gpiod || (fsel != BCM2835_FSEL_GPIO_IN && fsel != BCM2835_FSEL_GPIO_OUT))
bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);
if (fsel == BCM2835_FSEL_GPIO_IN)
return 0;

if (persist_gpio_outputs && fsel == BCM2835_FSEL_GPIO_OUT)
return 0;

/* disable by setting to GPIO_IN */
bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);
return 0;
}

Expand Down Expand Up @@ -990,7 +994,7 @@ static void bcm2835_pmx_gpio_disable_free(struct pinctrl_dev *pctldev,
struct pinctrl_gpio_range *range,
unsigned offset)
{
(void)bcm2835_pmx_free(pctldev, offset);
bcm2835_pmx_free(pctldev, offset);
}

static int bcm2835_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,
Expand Down Expand Up @@ -1378,6 +1382,9 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
goto out_remove;
}

dev_info(dev, "GPIO_OUT persistence: %s\n",
persist_gpio_outputs ? "yes" : "no");

return 0;

out_remove:
Expand Down
17 changes: 9 additions & 8 deletions drivers/pinctrl/pinctrl-rp1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,9 +573,9 @@ static const char * const irq_type_names[] = {
[IRQ_TYPE_LEVEL_LOW] = "level-low",
};

static bool strict_gpiod;
module_param(strict_gpiod, bool, 0644);
MODULE_PARM_DESC(strict_gpiod, "unless true, outputs remain outputs when freed");
static bool persist_gpio_outputs = true;
module_param(persist_gpio_outputs, bool, 0644);
MODULE_PARM_DESC(persist_gpio_outputs, "Enable GPIO_OUT persistence when pin is freed");

static int rp1_pinconf_set(struct pinctrl_dev *pctldev,
unsigned int offset, unsigned long *configs,
Expand Down Expand Up @@ -1205,11 +1205,12 @@ static int rp1_pmx_free(struct pinctrl_dev *pctldev, unsigned offset)
struct rp1_pin_info *pin = rp1_get_pin_pctl(pctldev, offset);
u32 fsel = rp1_get_fsel(pin);

/* Return non-GPIOs to GPIO_IN, unless strict_gpiod is set */
if (strict_gpiod || fsel != RP1_FSEL_GPIO) {
rp1_set_dir(pin, RP1_DIR_INPUT);
rp1_set_fsel(pin, RP1_FSEL_GPIO);
}
/* Return all pins to GPIO_IN, unless persist_gpio_outputs is set */
if (persist_gpio_outputs && fsel == RP1_FSEL_GPIO)
return 0;

rp1_set_dir(pin, RP1_DIR_INPUT);
rp1_set_fsel(pin, RP1_FSEL_GPIO);

return 0;
}
Expand Down