From: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
The SMBus devices have their IRQs disabled after a reset. We need to
configure them by calling rmi_driver_process_config_request() when
enabling the sensor.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
Tested-by: Andrew Duggan <aduggan@xxxxxxxxxxxxx>
---
drivers/input/rmi4/rmi_driver.c | 78 ++++++++++++++++++++++-------------------
drivers/input/rmi4/rmi_f11.c | 4 +++
2 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index fe5f2f9..264bc62 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -136,42 +136,6 @@ static void disable_sensor(struct rmi_device *rmi_dev)
data->enabled = false;
}
-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;
-
- if (data->enabled)
- return 0;
-
- if (rmi_dev->xport->ops->enable_device) {
- retval = rmi_dev->xport->ops->enable_device(rmi_dev->xport);
- if (retval)
- return retval;
- }
-
- xport = rmi_dev->xport;
- if (data->irq) {
- retval = request_threaded_irq(data->irq,
- xport->hard_irq ? xport->hard_irq : NULL,
- xport->irq_thread ?
- xport->irq_thread : rmi_irq_thread,
- data->irq_flags,
- dev_name(&rmi_dev->dev), xport);
- if (retval)
- return retval;
- } else if (data->polling) {
- retval = enable_polling(rmi_dev);
- if (retval < 0)
- return retval;
- }
-
- data->enabled = true;
-
- return rmi_process_interrupt_requests(rmi_dev);
-}
-
static void rmi_free_function_list(struct rmi_device *rmi_dev)
{
struct rmi_function *fn, *tmp;
@@ -318,6 +282,46 @@ int rmi_process_interrupt_requests(struct rmi_device *rmi_dev)
}
EXPORT_SYMBOL_GPL(rmi_process_interrupt_requests);
+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;
+
+ if (data->enabled)
+ return 0;
+
+ if (rmi_dev->xport->ops->enable_device) {
+ retval = rmi_dev->xport->ops->enable_device(rmi_dev->xport);
+ if (retval)
+ return retval;
+ }
+
+ retval = rmi_driver_process_config_requests(rmi_dev);
+ if (retval < 0)
+ return retval;
+
+ xport = rmi_dev->xport;
+ if (data->irq) {
+ retval = request_threaded_irq(data->irq,
+ xport->hard_irq ? xport->hard_irq : NULL,
+ xport->irq_thread ?
+ xport->irq_thread : rmi_irq_thread,
+ data->irq_flags,
+ dev_name(&rmi_dev->dev), xport);
+ if (retval)
+ return retval;
+ } else if (data->polling) {
+ retval = enable_polling(rmi_dev);
+ if (retval < 0)
+ return retval;
+ }
+
+ data->enabled = true;
+
+ return rmi_process_interrupt_requests(rmi_dev);
+}
+
/**
* rmi_driver_set_input_params - set input device id and other data.
*
@@ -960,7 +964,7 @@ static int rmi_driver_probe(struct device *dev)
if (data->f01_container->dev.driver) {
/* Driver already bound, so enable ATTN now. */
- enable_sensor(rmi_dev);
+ return enable_sensor(rmi_dev);
}
return 0;
diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c
index 2e1d506..0028176 100644
--- a/drivers/input/rmi4/rmi_f11.c
+++ b/drivers/input/rmi4/rmi_f11.c
@@ -1440,9 +1440,13 @@ static int rmi_f11_config(struct rmi_function *fn)
if (!sensor->report_abs)
drv->clear_irq_bits(fn->rmi_dev, f11->abs_mask);
+ else
+ drv->set_irq_bits(fn->rmi_dev, f11->abs_mask);
if (!sensor->report_rel)
drv->clear_irq_bits(fn->rmi_dev, f11->rel_mask);
+ else
+ drv->set_irq_bits(fn->rmi_dev, f11->rel_mask);
rc = f11_write_control_regs(fn, &f11->sensor.sens_query,
&f11->dev_controls, fn->fd.query_base_addr);
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
