extcon: int3496: Ignore incorrect IoRestriction for ID pin
PATCH v2 1/1 extcon: int3496: Ignore incorrect IoRestriction for ID pin
The commit
70216fd937fe ("extcon: int3496: Set the id pin to direction-input if necessary")
introduced a workaround for incorrect IoRestriction mode in ACPI table.
Now, when GPIO ACPI library does it in generic way, see the commit
1b2ca32ab0b8 ("gpiolib: acpi: Introduce NO_RESTRICTION quirk")
for the details, just set an appropriate quirk flag instead.
---
- add tags
- address comments from Chanwoo
drivers/extcon/extcon-intel-int3496.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/extcon/extcon-intel-int3496.c +5 -4
@@ -50,7 +50,11 @@ static const struct acpi_gpio_params vbus_gpios = { INT3496_GPIO_VBUS_EN, 0, falstatic const struct acpi_gpio_params mux_gpios = {INT3496_GPIO_USB_MUX ,0 , false };static const struct acpi_gpio_mapping acpi_int3496_default_gpios[] = { - {"id-gpios" , &id_gpios,1 }, +/* +* Some platforms have a bug in ACPI GPIO description making IRQ +* GPIO to be output only. Ask the GPIO core to ignore this limit. +*/ + {"id-gpios" , &id_gpios,1 ,ACPI_GPIO_QUIRK_NO_IO_RESTRICTION }, {"vbus-gpios" , &vbus_gpios,1 }, {"mux-gpios" , &mux_gpios,1 }, { },
@@ -112,9 +116,6 @@ static int int3496_probe(struct platform_device *pdev) ret =PTR_ERR (data->gpio_usb_id);dev_err (dev,"can't request USB ID GPIO: %d\n" , ret);return ret; - }else if (gpiod_get_direction (data->gpio_usb_id) !=GPIOF_DIR_IN ) { -dev_warn (dev,FW_BUG "USB ID GPIO not in input mode, fixing\n" ); -gpiod_direction_input (data->gpio_usb_id); } data->usb_id_irq =gpiod_to_irq (data->gpio_usb_id);
Signature · 1 line
2.16.1
Quoted 40 lines · Andy Shevchenko
The commit
70216fd937fe("extcon: int3496: Set the id pin to direction-input if necessary")introduced a workaround for incorrect IoRestriction mode in ACPI table.
Now, when GPIO ACPI library does it in generic way, see the commit
1b2ca32ab0b8("gpiolib: acpi: IntroduceNO_RESTRICTIONquirk")for the details, just set an appropriate quirk flag instead.
Reviewed-by Hans de Goede <[email protected]>Tested-by Hans de Goede <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>---
- add tags
- address comments from Chanwoodrivers/extcon/extcon-intel-int3496.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/extcon/extcon-intel-int3496.c +5
-1@@ -50,7 +50,11 @@ static const struct acpi_gpio_params vbus_gpios = { INT3496_GPIO_VBUS_EN, 0, falstatic const struct acpi_gpio_params mux_gpios = {INT3496_GPIO_USB_MUX ,0 , false };static const struct acpi_gpio_mapping acpi_int3496_default_gpios[] = { - {"id-gpios" , &id_gpios,1 }, +/* +* Some platforms have a bug in ACPI GPIO description making IRQ +* GPIO to be output only. Ask the GPIO core to ignore this limit. +*/ + {"id-gpios" , &id_gpios,1 ,ACPI_GPIO_QUIRK_NO_IO_RESTRICTION }, {"vbus-gpios" , &vbus_gpios,1 }, {"mux-gpios" , &mux_gpios,1 }, { },
drivers/extcon/extcon-intel-int3496.c static int int3496_probe(struct platform_device *pdev) · line 121
Quoted 9 lines
drivers/extcon/extcon-intel-int3496.c +0
-3@@ -112,9 +116,6 @@ static int int3496_probe(struct platform_device *pdev) ret =PTR_ERR (data->gpio_usb_id);dev_err (dev,"can't request USB ID GPIO: %d\n" , ret);return ret; - }else if (gpiod_get_direction (data->gpio_usb_id) !=GPIOF_DIR_IN ) { -dev_warn (dev,FW_BUG "USB ID GPIO not in input mode, fixing\n" ); -gpiod_direction_input (data->gpio_usb_id); } data->usb_id_irq =gpiod_to_irq (data->gpio_usb_id);
Applied it. Thanks.
Signature · 3 lines
Best Regards, Chanwoo Choi Samsung Electronics