Revert "pinctrl: bcm2835: Only return non-GPIOs to inputs"

pelwell · pelwell · commit b35d4781d4de · 2024-05-07T14:57:41.000+01:00
This reverts commit 2f8da7f.
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
@@ -939,12 +939,9 @@ 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;
 }
 
@@ -986,7 +983,10 @@ static void bcm2835_pmx_gpio_disable_free(struct pinctrl_dev *pctldev,
 		struct pinctrl_gpio_range *range,
 		unsigned offset)
 {
-	(void)bcm2835_pmx_free(pctldev, 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);
 }
 
 static int bcm2835_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,

Original file line number	Diff line number	Diff line change
`@@ -939,12 +939,9 @@ static int bcm2835_pmx_free(struct pinctrl_dev *pctldev,`
`939`	`939`	`unsigned offset)`
`940`	`940`	`{`
`941`	`941`	`struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);`
`942`		`- enum bcm2835_fsel fsel = bcm2835_pinctrl_fsel_get(pc, offset);`
`943`		`-`
`944`		`- /* Return non-GPIOs to GPIO_IN */`
`945`		`- if (fsel != BCM2835_FSEL_GPIO_IN && fsel != BCM2835_FSEL_GPIO_OUT)`
`946`		`- bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);`
`947`	`942`
	`943`	`+ /* disable by setting to GPIO_IN */`
	`944`	`+ bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);`
`948`	`945`	`return 0;`
`949`	`946`	`}`
`950`	`947`
`@@ -986,7 +983,10 @@ static void bcm2835_pmx_gpio_disable_free(struct pinctrl_dev *pctldev,`
`986`	`983`	`struct pinctrl_gpio_range *range,`
`987`	`984`	`unsigned offset)`
`988`	`985`	`{`
`989`		`- (void)bcm2835_pmx_free(pctldev, offset);`
	`986`	`+ struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);`
	`987`	`+`
	`988`	`+ /* disable by setting to GPIO_IN */`
	`989`	`+ bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);`
`990`	`990`	`}`
`991`	`991`
`992`	`992`	`static int bcm2835_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,`