pinctrl: bcm2835: Only return non-GPIOs to inputs

pelwell · popcornmix · commit 2f8da7f53ea2 · 2024-03-05T13:55:02.000Z
Allowing GPIO state to persist allows the use of gpioset to control
GPIO levels without having to use the --mode=wait feature.

Signed-off-by: Phil Elwell &lt;phil@raspberrypi.com&gt;
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -926,9 +926,12 @@ static int bcm2835_pmx_free(struct pinctrl_dev *pctldev,
 		unsigned offset)
 {
 	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 */
+	if (fsel != BCM2835_FSEL_GPIO_IN && fsel != BCM2835_FSEL_GPIO_OUT)
+		bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);
 
-	/* disable by setting to GPIO_IN */
-	bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);
 	return 0;
 }
 
@@ -970,10 +973,7 @@ static void bcm2835_pmx_gpio_disable_free(struct pinctrl_dev *pctldev,
 		struct pinctrl_gpio_range *range,
 		unsigned offset)
 {
-	struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
-
-	/* disable by setting to GPIO_IN */
-	bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);
+	(void)bcm2835_pmx_free(pctldev, offset);
 }
 
 static int bcm2835_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,

Original file line number	Diff line number	Diff line change
`@@ -926,9 +926,12 @@ static int bcm2835_pmx_free(struct pinctrl_dev *pctldev,`
`926`	`926`	`unsigned offset)`
`927`	`927`	`{`
`928`	`928`	`struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);`
	`929`	`+ enum bcm2835_fsel fsel = bcm2835_pinctrl_fsel_get(pc, offset);`
	`930`	`+`
	`931`	`+ /* Return non-GPIOs to GPIO_IN */`
	`932`	`+ if (fsel != BCM2835_FSEL_GPIO_IN && fsel != BCM2835_FSEL_GPIO_OUT)`
	`933`	`+ bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);`
`929`	`934`
`930`		`- /* disable by setting to GPIO_IN */`
`931`		`- bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);`
`932`	`935`	`return 0;`
`933`	`936`	`}`
`934`	`937`
`@@ -970,10 +973,7 @@ static void bcm2835_pmx_gpio_disable_free(struct pinctrl_dev *pctldev,`
`970`	`973`	`struct pinctrl_gpio_range *range,`
`971`	`974`	`unsigned offset)`
`972`	`975`	`{`
`973`		`- struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);`
`974`		`-`
`975`		`- /* disable by setting to GPIO_IN */`
`976`		`- bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);`
	`976`	`+ (void)bcm2835_pmx_free(pctldev, offset);`
`977`	`977`	`}`
`978`	`978`
`979`	`979`	`static int bcm2835_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,`