From: Lee Jones <lee.jones@linaro.org> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, sameo@linux.intel.com, Jonas Aaberg <jonas.aberg@stericsson.com>, Lee Jones <lee.jones@linaro.org> Subject: [PATCH 25/26] mfd: ab8500-gpadc: Reduce conversion timeout Date: Tue, 15 Jan 2013 12:56:05 +0000 [thread overview] Message-ID: <1358254566-12419-26-git-send-email-lee.jones@linaro.org> (raw) In-Reply-To: <1358254566-12419-1-git-send-email-lee.jones@linaro.org> From: Jonas Aaberg <jonas.aberg@stericsson.com> Reduce the conversion timeout from 2s to 0.5s Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com> --- drivers/mfd/ab8500-gpadc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c index 1fd8f78..a7a6c77 100644 --- a/drivers/mfd/ab8500-gpadc.c +++ b/drivers/mfd/ab8500-gpadc.c @@ -86,6 +86,8 @@ /* Time in ms before disabling regulator */ #define GPADC_AUDOSUSPEND_DELAY 1 +#define CONVERSION_TIME 500 /* ms */ + enum cal_channels { ADC_INPUT_VMAIN = 0, ADC_INPUT_BTEMP, @@ -372,7 +374,8 @@ int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel) goto out; } /* wait for completion of conversion */ - if (!wait_for_completion_timeout(&gpadc->ab8500_gpadc_complete, 2*HZ)) { + if (!wait_for_completion_timeout(&gpadc->ab8500_gpadc_complete, + msecs_to_jiffies(CONVERSION_TIME))) { dev_err(gpadc->dev, "timeout: didn't receive GPADC conversion interrupt\n"); ret = -EINVAL; @@ -598,8 +601,6 @@ static int ab8500_gpadc_runtime_resume(struct device *dev) static int ab8500_gpadc_runtime_idle(struct device *dev) { - struct ab8500_gpadc *gpadc = dev_get_drvdata(dev); - pm_runtime_suspend(dev); return 0; } -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: lee.jones@linaro.org (Lee Jones) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 25/26] mfd: ab8500-gpadc: Reduce conversion timeout Date: Tue, 15 Jan 2013 12:56:05 +0000 [thread overview] Message-ID: <1358254566-12419-26-git-send-email-lee.jones@linaro.org> (raw) In-Reply-To: <1358254566-12419-1-git-send-email-lee.jones@linaro.org> From: Jonas Aaberg <jonas.aberg@stericsson.com> Reduce the conversion timeout from 2s to 0.5s Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com> --- drivers/mfd/ab8500-gpadc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c index 1fd8f78..a7a6c77 100644 --- a/drivers/mfd/ab8500-gpadc.c +++ b/drivers/mfd/ab8500-gpadc.c @@ -86,6 +86,8 @@ /* Time in ms before disabling regulator */ #define GPADC_AUDOSUSPEND_DELAY 1 +#define CONVERSION_TIME 500 /* ms */ + enum cal_channels { ADC_INPUT_VMAIN = 0, ADC_INPUT_BTEMP, @@ -372,7 +374,8 @@ int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel) goto out; } /* wait for completion of conversion */ - if (!wait_for_completion_timeout(&gpadc->ab8500_gpadc_complete, 2*HZ)) { + if (!wait_for_completion_timeout(&gpadc->ab8500_gpadc_complete, + msecs_to_jiffies(CONVERSION_TIME))) { dev_err(gpadc->dev, "timeout: didn't receive GPADC conversion interrupt\n"); ret = -EINVAL; @@ -598,8 +601,6 @@ static int ab8500_gpadc_runtime_resume(struct device *dev) static int ab8500_gpadc_runtime_idle(struct device *dev) { - struct ab8500_gpadc *gpadc = dev_get_drvdata(dev); - pm_runtime_suspend(dev); return 0; } -- 1.7.9.5
next prev parent reply other threads:[~2013-01-15 12:57 UTC|newest] Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-01-15 12:55 [PATCH 00/26] AB8500 MFD overhaul Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 12:55 ` [PATCH 01/26] mfd: ab8500-sysctrl: Provide a platform specific pm_power_off() call-back Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 12:55 ` [PATCH 02/26] mfd: ab8500-sysctrl: If a charger is present, reboot instead Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-27 23:52 ` Samuel Ortiz 2013-01-27 23:52 ` Samuel Ortiz 2013-01-28 8:44 ` Lee Jones 2013-01-28 8:44 ` Lee Jones 2013-01-15 12:55 ` [PATCH 03/26] mfd: ab8500-sysctrl: Only reboot into charging mode if battery type is known Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 12:55 ` [PATCH 04/26] mfd: ab8500-sysctrl.c: Provide charging as reset reason Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 12:55 ` [PATCH 05/26] mfd: ab8500-gpadc: Change to mdelay for greater resolution Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-27 23:52 ` Samuel Ortiz 2013-01-27 23:52 ` Samuel Ortiz 2013-01-28 8:43 ` Lee Jones 2013-01-28 8:43 ` Lee Jones 2013-01-15 12:55 ` [PATCH 06/26] mfd: ab8500-sysctrl: Provide configuration for SysClkReqRfClkBuf registers Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-27 23:52 ` Samuel Ortiz 2013-01-27 23:52 ` Samuel Ortiz 2013-01-28 8:38 ` Lee Jones 2013-01-28 8:38 ` Lee Jones 2013-02-03 17:02 ` Samuel Ortiz 2013-02-03 17:02 ` Samuel Ortiz 2013-01-15 12:55 ` [PATCH 07/26] mfd: ab8500-sysctrl: export read/write symbols Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 12:55 ` [PATCH 08/26] mfd: abx500-core: Provide an API to dump all ABx500 registers Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 12:55 ` [PATCH 09/26] mfd: ab8500-debugfs: Provide a means for a user subscribe to IRQs Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-27 23:52 ` Samuel Ortiz 2013-01-27 23:52 ` Samuel Ortiz 2013-01-28 8:25 ` Lee Jones 2013-01-28 8:25 ` Lee Jones 2013-01-28 10:22 ` Lee Jones 2013-01-28 10:22 ` Lee Jones 2013-01-28 10:49 ` Samuel Ortiz 2013-01-28 10:49 ` Samuel Ortiz 2013-01-28 11:34 ` Lee Jones 2013-01-28 11:34 ` Lee Jones 2013-02-03 17:01 ` Samuel Ortiz 2013-02-03 17:01 ` Samuel Ortiz 2013-02-04 9:27 ` Lee Jones 2013-02-04 9:27 ` Lee Jones 2013-01-15 12:55 ` [PATCH 10/26] mfd: ab8500-debugfs: Wake-up device on debugfs IRQ Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-27 23:53 ` Samuel Ortiz 2013-01-27 23:53 ` Samuel Ortiz 2013-01-28 8:49 ` Lee Jones 2013-01-28 8:49 ` Lee Jones 2013-01-15 12:55 ` [PATCH 11/26] mfd: ab8500-debugfs: Keep count of IRQs in debugfs Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 12:55 ` [PATCH 12/26] mfd: ab8500-debugfs: Use NULL to initialise remaining NULL pointer Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 13:06 ` Mark Brown 2013-01-15 13:06 ` Mark Brown 2013-01-15 13:49 ` Lee Jones 2013-01-15 13:49 ` Lee Jones 2013-01-15 12:55 ` [PATCH 13/26] mfd: ab8500-debugfs: Formated access AB8500 registers from debugfs entry Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-27 23:53 ` Samuel Ortiz 2013-01-27 23:53 ` Samuel Ortiz 2013-01-28 8:47 ` Lee Jones 2013-01-28 8:47 ` Lee Jones 2013-01-15 12:55 ` [PATCH 14/26] mfd: ab8500-debugfs: Fix introduced compiler time warnings Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-27 23:53 ` Samuel Ortiz 2013-01-27 23:53 ` Samuel Ortiz 2013-01-28 8:45 ` Lee Jones 2013-01-28 8:45 ` Lee Jones 2013-01-15 12:55 ` [PATCH 15/26] mfd: ab8500-debugfs: Export all AB8500 ADCs as debugfs nodes Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 12:55 ` [PATCH 16/26] mfd: ab8500-debugfs: Set the USB charging current to 300mA for ABV3 Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 12:55 ` [PATCH 17/26] mfd: ab8500-debugfs: add debugfs node to read all registers Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 12:55 ` [PATCH 18/26] mfd: ab8500-core: Allow the possibility to dump all AB8500 registers Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 12:55 ` [PATCH 19/26] mfd: ab8500-debugfs: Allow number of IRQs to be provided more dynamically Lee Jones 2013-01-15 12:55 ` Lee Jones 2013-01-15 12:56 ` [PATCH 20/26] mfd ab8500-gpadc: Introduce new AB version detection Lee Jones 2013-01-15 12:56 ` Lee Jones 2013-01-15 12:56 ` [PATCH 21/26] mfd: ab8500-debugfs: Add interrupt debug Lee Jones 2013-01-15 12:56 ` Lee Jones 2013-01-15 12:56 ` [PATCH 22/26] mfd: ab8500-gpadc: Add runtime pm support Lee Jones 2013-01-15 12:56 ` Lee Jones 2013-01-15 12:56 ` [PATCH 23/26] mfd: ab8500-pwm: Enable support for AB8505 PWMLED blink Lee Jones 2013-01-15 12:56 ` Lee Jones 2013-01-27 23:53 ` Samuel Ortiz 2013-01-27 23:53 ` Samuel Ortiz 2013-01-28 8:13 ` Lee Jones 2013-01-28 8:13 ` Lee Jones 2013-01-15 12:56 ` [PATCH 24/26] mfd: ab8500-debugfs: sizeof() mismatch bugfix Lee Jones 2013-01-15 12:56 ` Lee Jones 2013-01-15 12:56 ` Lee Jones [this message] 2013-01-15 12:56 ` [PATCH 25/26] mfd: ab8500-gpadc: Reduce conversion timeout Lee Jones 2013-01-27 23:53 ` Samuel Ortiz 2013-01-27 23:53 ` Samuel Ortiz 2013-01-28 8:45 ` Lee Jones 2013-01-28 8:45 ` Lee Jones 2013-01-15 12:56 ` [PATCH 26/26] mfd: ab8500-gpadc: Use new ab8500_gpadc_get() with name parameter Lee Jones 2013-01-15 12:56 ` Lee Jones 2013-01-27 23:54 ` Samuel Ortiz 2013-01-27 23:54 ` Samuel Ortiz 2013-01-28 8:11 ` Lee Jones 2013-01-28 8:11 ` Lee Jones
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=1358254566-12419-26-git-send-email-lee.jones@linaro.org \ --to=lee.jones@linaro.org \ --cc=arnd@arndb.de \ --cc=jonas.aberg@stericsson.com \ --cc=linus.walleij@stericsson.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=sameo@linux.intel.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.