From: Andrew Duggan <aduggan@synaptics.com> To: Benjamin Tissoires <benjamin.tissoires@redhat.com>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Christopher Heiny <cheiny@synaptics.com>, Allie Xiong <axiong@synaptics.com> Cc: Stephen Chandler Paul <cpaul@redhat.com>, <benjamin.tissoires@gmail.com>, <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Vincent Huang <vincent.huang@tw.synaptics.com> Subject: Re: [PATCH 05/11] Input: synaptics-rmi4 - call rmi_driver_process_config_requests in enable_sensor Date: Thu, 2 Jul 2015 10:50:11 -0700 [thread overview] Message-ID: <559579D3.8090607@synaptics.com> (raw) In-Reply-To: <1435087050-11444-6-git-send-email-benjamin.tissoires@redhat.com> On 06/23/2015 12:17 PM, Benjamin Tissoires wrote: > 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@redhat.com> > --- Reviewed-by: Andrew Duggan <aduggan@synaptics.com> > 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 4bdf4a5..99d6181 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);
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Duggan <aduggan@synaptics.com> To: Benjamin Tissoires <benjamin.tissoires@redhat.com>, Dmitry Torokhov <dmitry.torokhov@gmail.com>, Christopher Heiny <cheiny@synaptics.com>, Allie Xiong <axiong@synaptics.com> Cc: Stephen Chandler Paul <cpaul@redhat.com>, benjamin.tissoires@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Huang <vincent.huang@tw.synaptics.com> Subject: Re: [PATCH 05/11] Input: synaptics-rmi4 - call rmi_driver_process_config_requests in enable_sensor Date: Thu, 2 Jul 2015 10:50:11 -0700 [thread overview] Message-ID: <559579D3.8090607@synaptics.com> (raw) In-Reply-To: <1435087050-11444-6-git-send-email-benjamin.tissoires@redhat.com> On 06/23/2015 12:17 PM, Benjamin Tissoires wrote: > 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@redhat.com> > --- Reviewed-by: Andrew Duggan <aduggan@synaptics.com> > 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 4bdf4a5..99d6181 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);
next prev parent reply other threads:[~2015-07-02 17:52 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-06-23 19:17 [PATCH 00/11] Input: synaptics-rmi4: various fixes for the existing rmi4 branch Benjamin Tissoires 2015-06-23 19:17 ` [PATCH 01/11] Input: synaptics-rmi4 - embed the function modules in rmi_core Benjamin Tissoires 2015-06-24 9:51 ` Paul Bolle 2015-06-24 14:10 ` Benjamin Tissoires 2015-07-02 17:49 ` Andrew Duggan 2015-07-02 17:49 ` Andrew Duggan 2015-06-23 19:17 ` [PATCH 02/11] Input: synaptics-rmi4 - add a common input device in rmi_driver Benjamin Tissoires 2015-07-02 17:49 ` Andrew Duggan 2015-07-02 17:49 ` Andrew Duggan 2015-06-23 19:17 ` [PATCH 03/11] Input: synaptics-rmi4 - explicitly request polling when needed Benjamin Tissoires 2015-07-02 17:50 ` Andrew Duggan 2015-07-02 17:50 ` Andrew Duggan 2015-06-23 19:17 ` [PATCH 04/11] Input: synaptics-rmi4 - prevent oopses when irq arrives while the device is not bound Benjamin Tissoires 2015-07-02 17:50 ` Andrew Duggan 2015-07-02 17:50 ` Andrew Duggan 2015-06-23 19:17 ` [PATCH 05/11] Input: synaptics-rmi4 - call rmi_driver_process_config_requests in enable_sensor Benjamin Tissoires 2015-07-02 17:50 ` Andrew Duggan [this message] 2015-07-02 17:50 ` Andrew Duggan 2015-06-23 19:17 ` [PATCH 06/11] Input: synaptics-rmi4 - add a reset callback Benjamin Tissoires 2015-06-23 19:17 ` [PATCH 07/11] Input: synaptics-rmi4 - f11: fix bitmap irq check Benjamin Tissoires 2015-07-02 17:50 ` Andrew Duggan 2015-07-02 17:50 ` Andrew Duggan 2015-06-23 19:17 ` [PATCH 08/11] Input: synaptics-rmi4 - f11: use the unified input node if available Benjamin Tissoires 2015-07-02 17:50 ` Andrew Duggan 2015-07-02 17:50 ` Andrew Duggan 2015-06-23 19:17 ` [PATCH 09/11] Input: synaptics-rmi4 - f11: clean up rmi_f11_finger_handler Benjamin Tissoires 2015-07-02 17:51 ` Andrew Duggan 2015-07-02 17:51 ` Andrew Duggan 2015-06-23 19:17 ` [PATCH 10/11] Input: synaptics-rmi4 - f11: allow the top software button property to be set Benjamin Tissoires 2015-07-02 17:51 ` Andrew Duggan 2015-07-02 17:51 ` Andrew Duggan 2015-06-23 19:17 ` [PATCH 11/11] Input: synaptics-rmi4 - f11: add support for kernel tracking Benjamin Tissoires 2015-07-02 17:51 ` Andrew Duggan 2015-07-02 17:51 ` Andrew Duggan 2015-07-23 17:10 ` [PATCH 00/11] Input: synaptics-rmi4: various fixes for the existing rmi4 branch Benjamin Tissoires 2015-10-31 20:41 ` Linus Walleij 2015-11-02 22:14 ` Andrew Duggan 2015-11-03 10:29 ` Linus Walleij 2015-11-03 14:01 ` Linus Walleij 2015-11-04 0:38 ` Andrew Duggan 2015-11-04 8:28 ` Benjamin Tissoires 2015-11-04 13:55 ` Linus Walleij
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=559579D3.8090607@synaptics.com \ --to=aduggan@synaptics.com \ --cc=axiong@synaptics.com \ --cc=benjamin.tissoires@gmail.com \ --cc=benjamin.tissoires@redhat.com \ --cc=cheiny@synaptics.com \ --cc=cpaul@redhat.com \ --cc=dmitry.torokhov@gmail.com \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=vincent.huang@tw.synaptics.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.