From: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> To: Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Cc: Hartmut Knaack <knaack.h-Mmb7MZpHnFY@public.gmane.org>, Lars-Peter Clausen <lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>, Peter Meerwald-Stadler <pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org>, linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Marcel Partap <mpartap-hi6Y0CQ0nG0@public.gmane.org>, Michael Scott <michael.scott-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, Sebastian Reichel <sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Subject: [PATCH 3/3] iio: adc: cpcap: Remove hung interrupt quirk Date: Thu, 18 May 2017 20:40:35 -0700 [thread overview] Message-ID: <20170519034035.16795-4-tony@atomide.com> (raw) In-Reply-To: <20170519034035.16795-1-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> This is no longer needed as the real problem was interrupt flags not getting passed properly from device tree to the cpcap-core.c mfd driver. This got fixed with commit ac89473213c6 ("mfd: cpcap: Fix interrupt to use level interrupt") So let's remove ADC interrupt specific the quirk. Cc: Marcel Partap <mpartap-hi6Y0CQ0nG0@public.gmane.org> Cc: Michael Scott <michael.scott-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Cc: Sebastian Reichel <sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Signed-off-by: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> --- drivers/iio/adc/cpcap-adc.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/drivers/iio/adc/cpcap-adc.c b/drivers/iio/adc/cpcap-adc.c --- a/drivers/iio/adc/cpcap-adc.c +++ b/drivers/iio/adc/cpcap-adc.c @@ -89,7 +89,7 @@ #define ST_ADC_CAL_BATTI_LOW_THRESHOLD 494 #define ST_ADC_CALIBRATE_DIFF_THRESHOLD 3 -#define CPCAP_ADC_MAX_RETRIES 5 /* Calibration and quirk */ +#define CPCAP_ADC_MAX_RETRIES 5 /* Calibration */ /** * struct cpcap_adc_ato - timing settings for cpcap adc @@ -635,27 +635,6 @@ static void cpcap_adc_setup_bank(struct cpcap_adc *ddata, } } -/* - * Occasionally the ADC does not seem to start and there will be no - * interrupt. Let's re-init interrupt to prevent the ADC from hanging - * for the next request. It is unclear why this happens, but the next - * request will usually work after doing this. - */ -static void cpcap_adc_quirk_reset_lost_irq(struct cpcap_adc *ddata) -{ - int error; - - dev_info(ddata->dev, "lost ADC irq, attempting to reinit\n"); - disable_irq(ddata->irq); - error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2, - CPCAP_BIT_ADTRIG_DIS, - CPCAP_BIT_ADTRIG_DIS); - if (error) - dev_warn(ddata->dev, "%s reset failed: %i\n", - __func__, error); - enable_irq(ddata->irq); -} - static int cpcap_adc_start_bank(struct cpcap_adc *ddata, struct cpcap_adc_request *req) { @@ -673,7 +652,6 @@ static int cpcap_adc_start_bank(struct cpcap_adc *ddata, return 0; if (error == 0) { - cpcap_adc_quirk_reset_lost_irq(ddata); error = -ETIMEDOUT; continue; } -- 2.13.0
WARNING: multiple messages have this Message-ID (diff)
From: Tony Lindgren <tony@atomide.com> To: Jonathan Cameron <jic23@kernel.org> Cc: Hartmut Knaack <knaack.h@gmx.de>, Lars-Peter Clausen <lars@metafoo.de>, Peter Meerwald-Stadler <pmeerw@pmeerw.net>, linux-iio@vger.kernel.org, linux-omap@vger.kernel.org, Marcel Partap <mpartap@gmx.net>, Michael Scott <michael.scott@linaro.org>, Sebastian Reichel <sre@kernel.org> Subject: [PATCH 3/3] iio: adc: cpcap: Remove hung interrupt quirk Date: Thu, 18 May 2017 20:40:35 -0700 [thread overview] Message-ID: <20170519034035.16795-4-tony@atomide.com> (raw) In-Reply-To: <20170519034035.16795-1-tony@atomide.com> This is no longer needed as the real problem was interrupt flags not getting passed properly from device tree to the cpcap-core.c mfd driver. This got fixed with commit ac89473213c6 ("mfd: cpcap: Fix interrupt to use level interrupt") So let's remove ADC interrupt specific the quirk. Cc: Marcel Partap <mpartap@gmx.net> Cc: Michael Scott <michael.scott@linaro.org> Cc: Sebastian Reichel <sre@kernel.org> Signed-off-by: Tony Lindgren <tony@atomide.com> --- drivers/iio/adc/cpcap-adc.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/drivers/iio/adc/cpcap-adc.c b/drivers/iio/adc/cpcap-adc.c --- a/drivers/iio/adc/cpcap-adc.c +++ b/drivers/iio/adc/cpcap-adc.c @@ -89,7 +89,7 @@ #define ST_ADC_CAL_BATTI_LOW_THRESHOLD 494 #define ST_ADC_CALIBRATE_DIFF_THRESHOLD 3 -#define CPCAP_ADC_MAX_RETRIES 5 /* Calibration and quirk */ +#define CPCAP_ADC_MAX_RETRIES 5 /* Calibration */ /** * struct cpcap_adc_ato - timing settings for cpcap adc @@ -635,27 +635,6 @@ static void cpcap_adc_setup_bank(struct cpcap_adc *ddata, } } -/* - * Occasionally the ADC does not seem to start and there will be no - * interrupt. Let's re-init interrupt to prevent the ADC from hanging - * for the next request. It is unclear why this happens, but the next - * request will usually work after doing this. - */ -static void cpcap_adc_quirk_reset_lost_irq(struct cpcap_adc *ddata) -{ - int error; - - dev_info(ddata->dev, "lost ADC irq, attempting to reinit\n"); - disable_irq(ddata->irq); - error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2, - CPCAP_BIT_ADTRIG_DIS, - CPCAP_BIT_ADTRIG_DIS); - if (error) - dev_warn(ddata->dev, "%s reset failed: %i\n", - __func__, error); - enable_irq(ddata->irq); -} - static int cpcap_adc_start_bank(struct cpcap_adc *ddata, struct cpcap_adc_request *req) { @@ -673,7 +652,6 @@ static int cpcap_adc_start_bank(struct cpcap_adc *ddata, return 0; if (error == 0) { - cpcap_adc_quirk_reset_lost_irq(ddata); error = -ETIMEDOUT; continue; } -- 2.13.0
next prev parent reply other threads:[~2017-05-19 3:40 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-05-19 3:40 [PATCH 0/3] Few non-critical cpcap ADC fixes Tony Lindgren 2017-05-19 3:40 ` Tony Lindgren [not found] ` <20170519034035.16795-1-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2017-05-19 3:40 ` [PATCH 1/3] iio: adc: cpcap: Fix default register values and battery temperature Tony Lindgren 2017-05-19 3:40 ` Tony Lindgren [not found] ` <20170519034035.16795-2-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2017-05-20 5:52 ` Matt Ranostay 2017-05-20 5:52 ` Matt Ranostay [not found] ` <CAJCx=gm7t=2nuHiLCXUohLXR62gZ-ux62tWyEQXyNXMrhTutKg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2017-05-20 15:51 ` Jonathan Cameron 2017-05-20 15:51 ` Jonathan Cameron 2017-05-20 16:02 ` Tony Lindgren 2017-05-20 16:02 ` Tony Lindgren 2017-05-19 3:40 ` [PATCH 2/3] iio: adc: cpcap: Fix die temperature Tony Lindgren 2017-05-19 3:40 ` Tony Lindgren [not found] ` <20170519034035.16795-3-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2017-05-20 15:55 ` Jonathan Cameron 2017-05-20 15:55 ` Jonathan Cameron [not found] ` <6b8ea7a4-5f5e-2d48-0893-94aa320433c6-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> 2017-05-20 16:35 ` Tony Lindgren 2017-05-20 16:35 ` Tony Lindgren [not found] ` <20170520163525.GM10472-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2017-05-20 16:39 ` Jonathan Cameron 2017-05-20 16:39 ` Jonathan Cameron 2017-05-19 3:40 ` Tony Lindgren [this message] 2017-05-19 3:40 ` [PATCH 3/3] iio: adc: cpcap: Remove hung interrupt quirk Tony Lindgren [not found] ` <20170519034035.16795-4-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2017-05-20 12:29 ` Sebastian Reichel 2017-05-20 12:29 ` Sebastian Reichel 2017-05-20 15:56 ` Jonathan Cameron 2017-05-20 15:56 ` Jonathan Cameron 2017-05-23 0:51 [PATCHv2 0/3] Few non-critical cpcap ADC fixes Tony Lindgren [not found] ` <20170523005146.726-1-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2017-05-23 0:51 ` [PATCH 3/3] iio: adc: cpcap: Remove hung interrupt quirk Tony Lindgren 2017-05-23 0:51 ` Tony Lindgren [not found] ` <20170523005146.726-4-tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org> 2017-05-24 19:24 ` Jonathan Cameron 2017-05-24 19:24 ` Jonathan Cameron
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=20170519034035.16795-4-tony@atomide.com \ --to=tony-4v6ys6ai5vpbdgjk7y7tuq@public.gmane.org \ --cc=jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=knaack.h-Mmb7MZpHnFY@public.gmane.org \ --cc=lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org \ --cc=linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=michael.scott-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=mpartap-hi6Y0CQ0nG0@public.gmane.org \ --cc=pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org \ --cc=sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ /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.