From: Vignesh R <vigneshr@ti.com>
To: Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Benoit Cousson <bcousson@baylibre.com>,
Tony Lindgren <tony@atomide.com>,
Russell King <linux@arm.linux.org.uk>,
Jonathan Cameron <jic23@kernel.org>,
Hartmut Knaack <knaack.h@gmx.de>, <richardcochran@gmail.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Lee Jones <lee.jones@linaro.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald <pmeerw@pmeerw.net>,
Samuel Ortiz <sameo@linux.intel.com>, Felipe Balbi <balbi@ti.com>,
Vignesh R <vigneshr@ti.com>, Brad Griffis <bgriffis@ti.com>,
Sanjeev Sharma <sanjeev_sharma@mentor.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Jan Kardell <jan.kardell@telliq.com>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-omap@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-iio@vger.kernel.org>, <linux-input@vger.kernel.org>
Subject: [PATCH v4 3/6] mfd: ti_am335x_tscadc: Remove unwanted reg_se_cache save
Date: Fri, 14 Nov 2014 10:37:28 +0530 [thread overview]
Message-ID: <1415941651-28962-4-git-send-email-vigneshr@ti.com> (raw)
In-Reply-To: <1415941651-28962-1-git-send-email-vigneshr@ti.com>
In one shot mode, sequencer automatically disables all enabled steps at
the end of each cycle. (both ADC steps and TSC steps) Hence these steps
need not be saved in reg_se_cache for clearing these steps at a later
stage.
Also, when ADC wakes up Sequencer should not be busy executing any of the
config steps except for the charge step. Previously charge step was 1 ADC
clock cycle and hence it was ignored.
Signed-off-by: Vignesh R <vigneshr@ti.com>
---
drivers/mfd/ti_am335x_tscadc.c | 7 +++++--
include/linux/mfd/ti_am335x_tscadc.h | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index d877e777cce6..110038859a8d 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -86,8 +86,12 @@ static void am335x_tscadc_need_adc(struct ti_tscadc_dev *tsadc)
spin_lock_irq(&tsadc->reg_lock);
finish_wait(&tsadc->reg_se_wait, &wait);
+ /*
+ * Sequencer should either be idle or
+ * busy applying the charge step.
+ */
reg = tscadc_readl(tsadc, REG_ADCFSM);
- WARN_ON(reg & SEQ_STATUS);
+ WARN_ON((reg & SEQ_STATUS) && !(reg & CHARGE_STEP));
tsadc->adc_waiting = false;
}
tsadc->adc_in_use = true;
@@ -96,7 +100,6 @@ static void am335x_tscadc_need_adc(struct ti_tscadc_dev *tsadc)
void am335x_tsc_se_set_once(struct ti_tscadc_dev *tsadc, u32 val)
{
spin_lock_irq(&tsadc->reg_lock);
- tsadc->reg_se_cache |= val;
am335x_tscadc_need_adc(tsadc);
tscadc_writel(tsadc, REG_SE, val);
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index 3f4e994ace2b..1fd50dcfe47c 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -128,6 +128,7 @@
/* Sequencer Status */
#define SEQ_STATUS BIT(5)
+#define CHARGE_STEP 0x11
#define ADC_CLK 3000000
#define TOTAL_STEPS 16
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Vignesh R <vigneshr-l0cyMroinI0@public.gmane.org>
To: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>,
Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
Ian Campbell
<ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>,
Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>,
Benoit Cousson <bcousson-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>,
Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>,
Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>,
Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Hartmut Knaack <knaack.h-Mmb7MZpHnFY@public.gmane.org>,
richardcochran-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
Dmitry Torokhov
<dmitry.torokhov-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
Sebastian Andrzej Siewior
<bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
Cc: Lars-Peter Clausen <lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>,
Peter Meerwald <pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org>,
Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>,
Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>,
Vignesh R <vigneshr-l0cyMroinI0@public.gmane.org>,
Brad Griffis <bgriffis-l0cyMroinI0@public.gmane.org>,
Sanjeev Sharma
<sanjeev_sharma-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>,
Paul Gortmaker
<paul.gortmaker-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>,
Jan Kardell <jan.kardell-KSZdJiTw9mzQT0dZR+AlfA@public.gmane.org>,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH v4 3/6] mfd: ti_am335x_tscadc: Remove unwanted reg_se_cache save
Date: Fri, 14 Nov 2014 10:37:28 +0530 [thread overview]
Message-ID: <1415941651-28962-4-git-send-email-vigneshr@ti.com> (raw)
In-Reply-To: <1415941651-28962-1-git-send-email-vigneshr-l0cyMroinI0@public.gmane.org>
In one shot mode, sequencer automatically disables all enabled steps at
the end of each cycle. (both ADC steps and TSC steps) Hence these steps
need not be saved in reg_se_cache for clearing these steps at a later
stage.
Also, when ADC wakes up Sequencer should not be busy executing any of the
config steps except for the charge step. Previously charge step was 1 ADC
clock cycle and hence it was ignored.
Signed-off-by: Vignesh R <vigneshr-l0cyMroinI0@public.gmane.org>
---
drivers/mfd/ti_am335x_tscadc.c | 7 +++++--
include/linux/mfd/ti_am335x_tscadc.h | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index d877e777cce6..110038859a8d 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -86,8 +86,12 @@ static void am335x_tscadc_need_adc(struct ti_tscadc_dev *tsadc)
spin_lock_irq(&tsadc->reg_lock);
finish_wait(&tsadc->reg_se_wait, &wait);
+ /*
+ * Sequencer should either be idle or
+ * busy applying the charge step.
+ */
reg = tscadc_readl(tsadc, REG_ADCFSM);
- WARN_ON(reg & SEQ_STATUS);
+ WARN_ON((reg & SEQ_STATUS) && !(reg & CHARGE_STEP));
tsadc->adc_waiting = false;
}
tsadc->adc_in_use = true;
@@ -96,7 +100,6 @@ static void am335x_tscadc_need_adc(struct ti_tscadc_dev *tsadc)
void am335x_tsc_se_set_once(struct ti_tscadc_dev *tsadc, u32 val)
{
spin_lock_irq(&tsadc->reg_lock);
- tsadc->reg_se_cache |= val;
am335x_tscadc_need_adc(tsadc);
tscadc_writel(tsadc, REG_SE, val);
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index 3f4e994ace2b..1fd50dcfe47c 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -128,6 +128,7 @@
/* Sequencer Status */
#define SEQ_STATUS BIT(5)
+#define CHARGE_STEP 0x11
#define ADC_CLK 3000000
#define TOTAL_STEPS 16
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: vigneshr@ti.com (Vignesh R)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 3/6] mfd: ti_am335x_tscadc: Remove unwanted reg_se_cache save
Date: Fri, 14 Nov 2014 10:37:28 +0530 [thread overview]
Message-ID: <1415941651-28962-4-git-send-email-vigneshr@ti.com> (raw)
In-Reply-To: <1415941651-28962-1-git-send-email-vigneshr@ti.com>
In one shot mode, sequencer automatically disables all enabled steps at
the end of each cycle. (both ADC steps and TSC steps) Hence these steps
need not be saved in reg_se_cache for clearing these steps at a later
stage.
Also, when ADC wakes up Sequencer should not be busy executing any of the
config steps except for the charge step. Previously charge step was 1 ADC
clock cycle and hence it was ignored.
Signed-off-by: Vignesh R <vigneshr@ti.com>
---
drivers/mfd/ti_am335x_tscadc.c | 7 +++++--
include/linux/mfd/ti_am335x_tscadc.h | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index d877e777cce6..110038859a8d 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -86,8 +86,12 @@ static void am335x_tscadc_need_adc(struct ti_tscadc_dev *tsadc)
spin_lock_irq(&tsadc->reg_lock);
finish_wait(&tsadc->reg_se_wait, &wait);
+ /*
+ * Sequencer should either be idle or
+ * busy applying the charge step.
+ */
reg = tscadc_readl(tsadc, REG_ADCFSM);
- WARN_ON(reg & SEQ_STATUS);
+ WARN_ON((reg & SEQ_STATUS) && !(reg & CHARGE_STEP));
tsadc->adc_waiting = false;
}
tsadc->adc_in_use = true;
@@ -96,7 +100,6 @@ static void am335x_tscadc_need_adc(struct ti_tscadc_dev *tsadc)
void am335x_tsc_se_set_once(struct ti_tscadc_dev *tsadc, u32 val)
{
spin_lock_irq(&tsadc->reg_lock);
- tsadc->reg_se_cache |= val;
am335x_tscadc_need_adc(tsadc);
tscadc_writel(tsadc, REG_SE, val);
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index 3f4e994ace2b..1fd50dcfe47c 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -128,6 +128,7 @@
/* Sequencer Status */
#define SEQ_STATUS BIT(5)
+#define CHARGE_STEP 0x11
#define ADC_CLK 3000000
#define TOTAL_STEPS 16
--
1.9.1
next prev parent reply other threads:[~2014-11-14 5:41 UTC|newest]
Thread overview: 141+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-14 5:07 [PATCH v4 0/6] Touchscreen performance related fixes Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-14 5:07 ` [PATCH v4 1/6] input: touchscreen: ti_am335x_tsc Interchange touchscreen and ADC steps Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-14 5:07 ` [PATCH v4 2/6] input: touchscreen: ti_am335x_tsc: Remove udelay in interrupt handler Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-15 19:27 ` Richard Cochran
2014-11-15 19:27 ` Richard Cochran
2014-11-15 19:27 ` Richard Cochran
2014-11-17 4:27 ` Vignesh R
2014-11-17 4:27 ` Vignesh R
2014-11-17 4:27 ` Vignesh R
2014-11-17 8:23 ` Richard Cochran
2014-11-17 8:23 ` Richard Cochran
2014-11-17 8:23 ` Richard Cochran
2014-11-17 12:18 ` Vignesh R
2014-11-17 12:18 ` Vignesh R
2014-11-17 12:18 ` Vignesh R
2014-11-14 5:07 ` Vignesh R [this message]
2014-11-14 5:07 ` [PATCH v4 3/6] mfd: ti_am335x_tscadc: Remove unwanted reg_se_cache save Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-18 14:30 ` Lee Jones
2014-11-18 14:30 ` Lee Jones
2014-11-18 14:30 ` Lee Jones
2014-11-18 17:12 ` Dmitry Torokhov
2014-11-18 17:12 ` Dmitry Torokhov
2014-11-18 17:12 ` Dmitry Torokhov
2014-11-20 13:56 ` Sekhar Nori
2014-11-20 13:56 ` Sekhar Nori
2014-11-20 13:56 ` Sekhar Nori
2014-11-20 14:23 ` Griffis, Brad
2014-11-20 14:23 ` Griffis, Brad
2014-11-20 14:23 ` Griffis, Brad
2014-11-20 14:23 ` Griffis, Brad
2014-11-20 14:34 ` Richard Cochran
2014-11-20 14:34 ` Richard Cochran
2014-11-20 14:34 ` Richard Cochran
2014-11-20 14:34 ` Richard Cochran
2014-11-20 14:40 ` Richard Cochran
2014-11-20 14:40 ` Richard Cochran
2014-11-20 14:40 ` Richard Cochran
2014-11-21 12:10 ` Sekhar Nori
2014-11-21 12:10 ` Sekhar Nori
2014-11-21 12:10 ` Sekhar Nori
2014-11-21 13:10 ` Richard Cochran
2014-11-21 13:10 ` Richard Cochran
2014-11-21 13:10 ` Richard Cochran
2014-11-21 15:11 ` Johannes Pointner
2014-11-21 15:11 ` Johannes Pointner
2014-11-21 15:11 ` Johannes Pointner
2014-11-21 15:37 ` Sekhar Nori
2014-11-21 15:37 ` Sekhar Nori
2014-11-21 15:37 ` Sekhar Nori
2014-11-21 18:17 ` Johannes Pointner
2014-11-21 18:17 ` Johannes Pointner
2014-11-21 18:17 ` Johannes Pointner
2014-11-21 21:40 ` Richard Cochran
2014-11-21 21:40 ` Richard Cochran
2014-11-21 21:40 ` Richard Cochran
2014-11-21 22:25 ` Griffis, Brad
2014-11-21 22:25 ` Griffis, Brad
2014-11-21 22:25 ` Griffis, Brad
2014-11-21 22:25 ` Griffis, Brad
2014-11-24 8:32 ` Johannes Pointner
2014-11-24 8:32 ` Johannes Pointner
2014-11-24 8:32 ` Johannes Pointner
2014-11-24 8:32 ` Johannes Pointner
2014-11-24 8:57 ` Sebastian Andrzej Siewior
2014-11-24 8:57 ` Sebastian Andrzej Siewior
2014-11-24 8:57 ` Sebastian Andrzej Siewior
2014-11-24 10:01 ` Richard Cochran
2014-11-24 10:01 ` Richard Cochran
2014-11-24 10:01 ` Richard Cochran
2014-11-14 5:07 ` [PATCH v4 4/6] ARM: dts: AM335x: Make charge delay a DT parameter for TSC Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-14 18:03 ` Tony Lindgren
2014-11-14 18:03 ` Tony Lindgren
2014-11-14 18:03 ` Tony Lindgren
2014-11-14 5:07 ` [PATCH v4 5/6] input: touchscreen: ti_am335x_tsc: Use charge delay DT parameter Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-14 5:07 ` [PATCH v4 6/6] input: touchscreen: ti_am335x_tsc: Replace delta filtering with median filtering Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-14 5:07 ` Vignesh R
2014-11-24 11:51 ` [PATCH v4 0/6] Touchscreen performance related fixes Sebastian Andrzej Siewior
2014-11-24 11:51 ` Sebastian Andrzej Siewior
2014-11-24 11:51 ` Sebastian Andrzej Siewior
2014-11-24 12:16 ` Vignesh R
2014-11-24 12:16 ` Vignesh R
2014-11-24 12:16 ` Vignesh R
2014-11-24 12:35 ` Sebastian Andrzej Siewior
2014-11-24 12:35 ` Sebastian Andrzej Siewior
2014-11-24 12:35 ` Sebastian Andrzej Siewior
2014-11-27 4:29 ` Vignesh R
2014-11-27 4:29 ` Vignesh R
2014-11-27 4:29 ` Vignesh R
2014-12-01 9:53 ` Vignesh R
2014-12-01 9:53 ` Vignesh R
2014-12-01 9:53 ` Vignesh R
2014-12-01 9:59 ` Sebastian Andrzej Siewior
2014-12-01 9:59 ` Sebastian Andrzej Siewior
2014-12-01 9:59 ` Sebastian Andrzej Siewior
2014-12-01 10:29 ` Vignesh R
2014-12-01 10:29 ` Vignesh R
2014-12-01 10:29 ` Vignesh R
2014-12-11 20:34 ` Nicolae Rosia
2014-12-11 20:34 ` Nicolae Rosia
2014-12-11 20:34 ` Nicolae Rosia
2014-12-11 20:40 ` Sebastian Andrzej Siewior
2014-12-11 20:40 ` Sebastian Andrzej Siewior
2014-12-11 20:40 ` Sebastian Andrzej Siewior
2014-12-12 13:48 ` Vignesh R
2014-12-12 13:48 ` Vignesh R
2014-12-12 13:48 ` Vignesh R
2014-12-12 13:55 ` Catalin Crenguta
2014-12-12 13:55 ` Catalin Crenguta
2014-12-12 13:55 ` Catalin Crenguta
2014-12-12 14:16 ` Griffis, Brad
2014-12-12 14:16 ` Griffis, Brad
2014-12-12 14:16 ` Griffis, Brad
2014-12-12 14:16 ` Griffis, Brad
2014-12-15 7:55 ` Catalin Crenguta
2014-12-15 7:55 ` Catalin Crenguta
2014-12-15 7:55 ` Catalin Crenguta
2014-12-15 7:55 ` Catalin Crenguta
2014-12-15 12:45 ` Catalin Crenguta
2014-12-15 12:45 ` Catalin Crenguta
2014-12-15 12:45 ` Catalin Crenguta
2014-12-15 12:45 ` Catalin Crenguta
2014-12-16 8:31 ` Catalin Crenguta
2014-12-16 8:31 ` Catalin Crenguta
2014-12-16 8:31 ` Catalin Crenguta
2014-12-16 8:31 ` Catalin Crenguta
2014-12-16 15:30 ` Richard Cochran
2014-12-16 15:30 ` Richard Cochran
2014-12-16 15:30 ` Richard Cochran
2014-12-16 15:30 ` Richard Cochran
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=1415941651-28962-4-git-send-email-vigneshr@ti.com \
--to=vigneshr@ti.com \
--cc=balbi@ti.com \
--cc=bcousson@baylibre.com \
--cc=bgriffis@ti.com \
--cc=bigeasy@linutronix.de \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jan.kardell@telliq.com \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=paul.gortmaker@windriver.com \
--cc=pawel.moll@arm.com \
--cc=pmeerw@pmeerw.net \
--cc=richardcochran@gmail.com \
--cc=robh+dt@kernel.org \
--cc=sameo@linux.intel.com \
--cc=sanjeev_sharma@mentor.com \
--cc=tony@atomide.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: link
Be 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.