Revert "gpio: tegra: Ensure pinctrl input-enable is set for interrupts"

This reverts commit d723dd651d3a54c40efb4ff6f0e381ed7ac6aee3.
jonhunter · Apr 17, 2021 · 9396c23 · 9396c23
1 parent 4d26cd8
commit 9396c23
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
@@ -345,6 +345,8 @@ static int tegra_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 
 	raw_spin_unlock_irqrestore(&bank->lvl_lock[port], flags);
 
+	tegra_gpio_mask_write(tgi, GPIO_MSK_OE(tgi, gpio), gpio, 0);
+
 	ret = gpiochip_lock_as_irq(&tgi->gc, gpio);
 	if (ret) {
 		dev_err(tgi->dev,
@@ -583,11 +585,8 @@ static int tegra_gpio_irq_request_resources(struct irq_data *d)
 {
 	struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
 	struct tegra_gpio_info *tgi = gpiochip_get_data(chip);
-	int ret;
 
-	ret = tegra_gpio_direction_input(chip, d->hwirq);
-	if (ret < 0)
-		return ret;
+	tegra_gpio_enable(tgi, d->hwirq);
 
 	ret = gpiochip_reqres_irq(chip, d->hwirq);
 	if (ret < 0)