Skip to content

Commit 70216fd

Browse files
jwrdegoedechanwoochoi
authored andcommitted
extcon: int3496: Set the id pin to direction-input if necessary
With the new more strict ACPI gpio code the dsdt's IoRestriction flags are honored on gpiod_get, but in some dsdt's it is wrong, so explicitly call gpiod_direction_input on the id gpio if necessary. This fixes the following errors when the int3496 code is used together with the new more strict ACPI gpio code: [ 2382.484415] gpio gpiochip1: (INT33FF:01): gpiochip_lock_as_irq: tried to flag a GPIO set as output for IRQ [ 2382.484425] gpio gpiochip1: (INT33FF:01): unable to lock HW IRQ 3 for IRQ [ 2382.484429] genirq: Failed to request resources for INT3496:00 (irq 174) on irqchip chv-gpio [ 2382.484518] intel-int3496 INT3496:00: can't request IRQ for USB ID GPIO: -22 [ 2382.500359] intel-int3496: probe of INT3496:00 failed with error -22 Signed-off-by: Hans de Goede <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Signed-off-by: Chanwoo Choi <[email protected]>
1 parent 408c5b4 commit 70216fd

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/extcon/extcon-intel-int3496.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ static int int3496_probe(struct platform_device *pdev)
113113
ret = PTR_ERR(data->gpio_usb_id);
114114
dev_err(dev, "can't request USB ID GPIO: %d\n", ret);
115115
return ret;
116+
} else if (gpiod_get_direction(data->gpio_usb_id) != GPIOF_DIR_IN) {
117+
dev_warn(dev, FW_BUG "USB ID GPIO not in input mode, fixing\n");
118+
gpiod_direction_input(data->gpio_usb_id);
116119
}
117120

118121
data->usb_id_irq = gpiod_to_irq(data->gpio_usb_id);

0 commit comments

Comments
 (0)