input synaptics-rmi4: Bug fixes to ATTN GPIO handling.
Subsystems (2)
PATCH v5 1/1 input synaptics-rmi4: Bug fixes to ATTN GPIO handling.
This patch fixes some bugs in handling of the RMI4 attention line GPIO.
1) in enable_sensor(), eliminate the complicated check on ATTN and just call process_interrupt_requests(). This will have minimal overhead if ATTN is not asserted, and clears the state of the RMI4 device in any case.
2) Correctly free the GPIO in rmi_driver_remove().
3) in rmi_driver_probe()
- declare the name of the attention gpio (GPIO_LABEL)
- use gpio_request_one() to get the gpio and export it.
- simplify (somewhat) conditional gpio acquisition logic and combine with interrupt setup
4) use gpio_is_valid() instead of comparing to 0.
---
drivers/input/rmi4/rmi_driver.c | 66 ++++++++++++++++++++++++----------------- drivers/input/rmi4/rmi_driver.h | 1 + 2 files changed, 40 insertions(+), 27 deletions(-)
drivers/input/rmi4/rmi_driver.c +39 -27
@@ -140,7 +140,6 @@ static int enable_sensor(struct rmi_device *rmi_dev)struct rmi_driver_data *data =dev_get_drvdata (&rmi_dev->dev);struct rmi_transport_dev *xport;int retval =0 ; -struct rmi_device_platform_data *pdata =to_rmi_platform_data (rmi_dev);if (data->enabled)return 0 ;
@@ -169,11 +168,7 @@ static int enable_sensor(struct rmi_device *rmi_dev) data->enabled = true; -if (!pdata->level_triggered && -gpio_get_value (pdata->attn_gpio) == pdata->attn_polarity) - retval =process_interrupt_requests (rmi_dev); - -return retval; +return process_interrupt_requests (rmi_dev); }static void rmi_free_function_list (struct rmi_device *rmi_dev)
@@ -800,10 +795,16 @@ static SIMPLE_DEV_PM_OPS(rmi_driver_pm, rmi_driver_suspend, rmi_driver_resume);static int rmi_driver_remove (struct device *dev) {struct rmi_device *rmi_dev =to_rmi_device (dev); +const struct rmi_device_platform_data *pdata = +to_rmi_platform_data (rmi_dev); +const struct rmi_driver_data *data =dev_get_drvdata (&rmi_dev->dev);disable_sensor (rmi_dev);rmi_free_function_list (rmi_dev); +if (data->gpio_held) +gpio_free (pdata->attn_gpio); +return 0 ; }
@@ -815,6 +816,7 @@ static int rmi_driver_probe(struct device *dev)struct rmi_device_platform_data *pdata;int retval =0 ;struct rmi_device *rmi_dev; +static const char GPIO_LABEL [] ="attn" ;dev_dbg (dev,"%s: Starting probe.\n" , __func__);
@@ -937,7 +939,9 @@ static int rmi_driver_probe(struct device *dev)mutex_init (&data->suspend_mutex); } -if (pdata->attn_gpio) { +if (gpio_is_valid (pdata->attn_gpio)) { +ulong gpio_flags =GPIOF_DIR_IN ; + data->irq =gpio_to_irq (pdata->attn_gpio);if (pdata->level_triggered) { data->irq_flags = IRQF_ONESHOT |
@@ -948,33 +952,41 @@ static int rmi_driver_probe(struct device *dev) (pdata->attn_polarity ==RMI_ATTN_ACTIVE_HIGH ) ?IRQF_TRIGGER_RISING :IRQF_TRIGGER_FALLING ; } - }else - data->poll_interval =ktime_set (0 , - (pdata->poll_interval_ms ? pdata->poll_interval_ms : -DEFAULT_POLL_INTERVAL_MS ) *1000 *1000 ); - -if (data->f01_container->dev.driver) { -/* Driver already bound, so enable ATTN now. */ -enable_sensor (rmi_dev); - } -if (IS_ENABLED (CONFIG_RMI4_DEV ) && pdata->attn_gpio) { - retval =gpio_export (pdata->attn_gpio, false); +if (IS_ENABLED (CONFIG_RMI4_DEV )) + gpio_flags |=GPIOF_EXPORT ; + retval =gpio_request_one (pdata->attn_gpio, gpio_flags, +GPIO_LABEL );if (retval) { -dev_warn (dev,"WARNING: Failed to export ATTN gpio!\n" ); +dev_warn (dev,"WARNING: Failed to request ATTN gpio %d, code=%d.\n" , + pdata->attn_gpio, retval); retval =0 ; }else { - retval =gpio_export_link (dev, -"attn" , pdata->attn_gpio); -if (retval) { -dev_warn (dev, -"WARNING: Failed to symlink ATTN gpio!\n" ); - retval =0 ; - }else { -dev_info (dev,"Exported ATTN GPIO %d." , +dev_info (dev,"Obtained ATTN gpio %d.\n" , pdata->attn_gpio); + data->gpio_held = true; +if (IS_ENABLED (CONFIG_RMI4_DEV )) { + retval =gpio_export_link (dev, +GPIO_LABEL , pdata->attn_gpio); +if (retval) { +dev_warn (dev, +"WARNING: Failed to symlink ATTN gpio!\n" ); + retval =0 ; + }else { +dev_info (dev,"Exported ATTN gpio %d." , + pdata->attn_gpio); + } } } + }else { + data->poll_interval =ktime_set (0 , + (pdata->poll_interval_ms ? pdata->poll_interval_ms : +DEFAULT_POLL_INTERVAL_MS ) *1000 *1000 ); + } + +if (data->f01_container->dev.driver) { +/* Driver already bound, so enable ATTN now. */ +enable_sensor (rmi_dev); }return 0 ;
drivers/input/rmi4/rmi_driver.h +1 -0
@@ -41,6 +41,7 @@ struct rmi_driver_data {u32 attn_count;u32 irq_debug;/* Should be bool, but debugfs wants u32 */ +bool gpio_held;int irq;int irq_flags;int num_of_irq_regs;
Quoted 14 lines · Christopher Heiny
This patch fixes some bugs in handling of the RMI4 attention line GPIO.
1) in
enable_sensor(), eliminate the complicated check on ATTN and just callprocess_interrupt_requests(). This will have minimal overhead if ATTN is not asserted, and clears the state of the RMI4 device in any case.2) Correctly free the GPIO in
rmi_driver_remove().3) in
rmi_driver_probe()
- declare the name of the attention gpio (GPIO_LABEL)
- usegpio_request_one()to get the gpio and export it.
- simplify (somewhat) conditional gpio acquisition logic and combine with interrupt setup
Quoted 5 lines
4) use
gpio_is_valid()instead of comparing to 0.Signed-off-by Christopher Heiny <[email protected]>Cc Dmitry Torokhov <[email protected]>Cc Benjamin Tissoires <[email protected]>
Applied, thank you.
Signature · 1 line
Dmitry