Skip to content

Commit 437764a

Browse files
committed
Revert "pinctrl: bcm2835: Add strict_gpiod module parameter"
This reverts commit c6ee931.
1 parent fd553e0 commit 437764a

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/pinctrl/bcm/pinctrl-bcm2835.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,6 @@ static const char * const irq_type_names[] = {
244244
[IRQ_TYPE_LEVEL_LOW] = "level-low",
245245
};
246246

247-
static bool strict_gpiod;
248-
module_param(strict_gpiod, bool, 0644);
249-
MODULE_PARM_DESC(strict_gpiod, "unless true, outputs remain outputs when freed");
250-
251247
static inline u32 bcm2835_gpio_rd(struct bcm2835_pinctrl *pc, unsigned reg)
252248
{
253249
return readl(pc->base + reg);
@@ -945,8 +941,8 @@ static int bcm2835_pmx_free(struct pinctrl_dev *pctldev,
945941
struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
946942
enum bcm2835_fsel fsel = bcm2835_pinctrl_fsel_get(pc, offset);
947943

948-
/* Return non-GPIOs to GPIO_IN, unless strict_gpiod is set */
949-
if (strict_gpiod || (fsel != BCM2835_FSEL_GPIO_IN && fsel != BCM2835_FSEL_GPIO_OUT))
944+
/* Return non-GPIOs to GPIO_IN */
945+
if (fsel != BCM2835_FSEL_GPIO_IN && fsel != BCM2835_FSEL_GPIO_OUT)
950946
bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN);
951947

952948
return 0;

0 commit comments

Comments
 (0)