From: Zubair Lutfullah <zubair.lutfullah@gmail.com>
To: jic23@cam.ac.uk
Cc: gregkh@linuxfoundation.org, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org, koen@dominion.thruhere.net
Subject: [PATCH 01/15] MFD: ti_tscadc: disable TSC config registers in adc mode
Date: Thu, 18 Jul 2013 23:21:12 +0100 [thread overview]
Message-ID: <1374186086-5015-2-git-send-email-zubair.lutfullah@gmail.com> (raw)
In-Reply-To: <1374186086-5015-1-git-send-email-zubair.lutfullah@gmail.com>
From: "Patil, Rachna" <rachna@ti.com>
AFE Pen Ctrl and TouchScreen transistors enabling is not
required when only ADC mode is being used, so check for availability of
TSC driver before accessing control register.
Signed-off-by: Patil, Rachna <rachna@ti.com>
Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Zubair Lutfullah <zubair.lutfullah@gmail.com>
---
drivers/mfd/ti_am335x_tscadc.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index b003a16..d72001c 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -208,13 +208,14 @@ static int ti_tscadc_probe(struct platform_device *pdev)
/* Set the control register bits */
ctrl = CNTRLREG_STEPCONFIGWRT |
- CNTRLREG_TSCENB |
- CNTRLREG_STEPID |
- CNTRLREG_4WIRE;
+ CNTRLREG_STEPID;
+ if (tsc_wires > 0)
+ ctrl |= CNTRLREG_4WIRE | CNTRLREG_TSCENB;
tscadc_writel(tscadc, REG_CTRL, ctrl);
/* Set register bits for Idle Config Mode */
- tscadc_idle_config(tscadc);
+ if (tsc_wires > 0)
+ tscadc_idle_config(tscadc);
/* Enable the TSC module enable bit */
ctrl = tscadc_readl(tscadc, REG_CTRL);
@@ -294,10 +295,13 @@ static int tscadc_resume(struct device *dev)
pm_runtime_get_sync(dev);
/* context restore */
- ctrl = CNTRLREG_STEPCONFIGWRT | CNTRLREG_TSCENB |
- CNTRLREG_STEPID | CNTRLREG_4WIRE;
+ ctrl = CNTRLREG_STEPCONFIGWRT | CNTRLREG_STEPID;
+ if (tscadc_dev->tsc_cell != -1)
+ ctrl |= CNTRLREG_TSCENB | CNTRLREG_4WIRE;
tscadc_writel(tscadc_dev, REG_CTRL, ctrl);
- tscadc_idle_config(tscadc_dev);
+
+ if (tscadc_dev->tsc_cell != -1)
+ tscadc_idle_config(tscadc_dev);
am335x_tsc_se_update(tscadc_dev);
restore = tscadc_readl(tscadc_dev, REG_CTRL);
tscadc_writel(tscadc_dev, REG_CTRL,
--
1.7.9.5
next prev parent reply other threads:[~2013-07-18 22:25 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-18 22:21 [PATCH 00/15] iio: ti_am335x_adc: Add continuous mode take 2 Zubair Lutfullah
2013-07-18 22:21 ` Zubair Lutfullah [this message]
2013-07-18 22:45 ` [PATCH 01/15] MFD: ti_tscadc: disable TSC config registers in adc mode Greg KH
2013-07-19 20:47 ` Zubair Lutfullah :
2013-07-19 23:13 ` Greg KH
2013-07-18 22:21 ` [PATCH 02/15] iio: ti_am335x_adc: Fix wrong samples received on 1st read Zubair Lutfullah
2013-07-20 10:52 ` Jonathan Cameron
2013-07-18 22:21 ` [PATCH 03/15] input: ti_tsc: Enable shared IRQ for TSC Zubair Lutfullah
2013-07-20 10:57 ` Jonathan Cameron
2013-07-20 10:58 ` Jonathan Cameron
2013-07-18 22:21 ` [PATCH 04/15] iio: mfd: input: ti_am335x_adc:Add support for continuous mode Zubair Lutfullah
2013-07-20 11:15 ` Jonathan Cameron
2013-07-18 22:21 ` [PATCH 05/15] MFD: ti_tscadc: ADC Clock check not required Zubair Lutfullah
2013-07-20 11:16 ` Jonathan Cameron
2013-07-18 22:21 ` [PATCH 06/15] iio: ti_am335x_adc: Handle set to clear IRQENABLE Zubair Lutfullah
2013-07-20 11:19 ` Jonathan Cameron
2013-07-18 22:21 ` [PATCH 07/15] iio: ti_am335x_adc: Handle set to clear IRQSTATUS Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 08/15] iio: ti_am335x_adc: Handle overrun before threshold event Zubair Lutfullah
2013-07-20 11:21 ` Jonathan Cameron
2013-07-18 22:21 ` [PATCH 09/15] iio: ti_am335x_adc: Avoid double " Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 10/15] iio: ti_am335x_adc: Also clear threshold event when clearing overrun event Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 11/15] iio: ti_am335x_adc: Print error and handle short FIFO events Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 12/15] iio: ti_am335x_adc: Fix allocation count of FIFO buffer Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 13/15] iio: ti_am335x_adc: Fix capture operation during resume Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 14/15] iio: ti_am335x_adc: Reset and clear overrun status before capture Zubair Lutfullah
2013-07-18 22:21 ` [PATCH 15/15] iio: ti_am335x_adc: Properly handle out of memory situation Zubair Lutfullah
2013-07-20 11:25 ` [PATCH 00/15] iio: ti_am335x_adc: Add continuous mode take 2 Jonathan Cameron
2013-07-20 12:47 ` Zubair Lutfullah :
2013-07-20 12:54 ` Lars-Peter Clausen
2013-07-20 13:50 ` 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=1374186086-5015-2-git-send-email-zubair.lutfullah@gmail.com \
--to=zubair.lutfullah@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@cam.ac.uk \
--cc=koen@dominion.thruhere.net \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).