From: Luotao Fu <l.fu@pengutronix.de>
To: Rabin VINCENT <rabin.vincent@stericsson.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Linus WALLEIJ <linus.walleij@stericsson.com>,
linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
STEricsson_nomadik_linux <STEricsson_nomadik_linux@list.st.com>,
Luotao Fu <l.fu@pengutronix.de>
Subject: [PATCH 5/6 V2] mfd/stmpexxx: fix stmpe811 enable hook
Date: Thu, 24 Jun 2010 14:27:46 +0200 [thread overview]
Message-ID: <1277382466-23603-1-git-send-email-l.fu@pengutronix.de> (raw)
In-Reply-To: <1277378021-16802-7-git-send-email-l.fu@pengutronix.de>
Fix the stmpe811 enable hook so that we can activate the needed clocks for the
touchscreen controller.
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
---
V2 Changes:
separate ADC block enable and ts block enable.
drivers/mfd/stmpe-devices.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/stmpe-devices.c b/drivers/mfd/stmpe-devices.c
index 3e21c26..ded9dcb 100644
--- a/drivers/mfd/stmpe-devices.c
+++ b/drivers/mfd/stmpe-devices.c
@@ -117,8 +117,8 @@ static int stmpe811_enable(struct stmpe *stmpe, unsigned int blocks,
if (blocks & STMPE_BLOCK_ADC)
mask |= STMPE811_SYS_CTRL2_ADC_OFF;
- if (blocks & STMPE_BLOCK_KEYPAD)
- mask |= STMPE811_SYS_CTRL2_TSC_OFF;
+ if (blocks & STMPE_BLOCK_TOUCHSCREEN)
+ mask |= STMPE811_SYS_CTRL2_ADC_OFF;
return stmpe_set_bits(stmpe, STMPE811_REG_SYS_CTRL2, mask,
enable ? 0 : mask);
--
1.7.1
next prev parent reply other threads:[~2010-06-24 12:27 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-31 12:17 [PATCH 1/3] mfd: add STMPExxxx I/O Expander support Rabin Vincent
2010-05-31 12:17 ` [PATCH 2/3] gpio: add STMPExxxx GPIO driver Rabin Vincent
2010-05-31 12:17 ` [PATCH 3/3] input: add STMPExxxx keypad driver Rabin Vincent
2010-06-01 22:16 ` Dmitry Torokhov
2010-06-02 13:56 ` Rabin VINCENT
2010-06-02 16:05 ` Dmitry Torokhov
2010-06-18 23:42 ` [PATCH 1/3] mfd: add STMPExxxx I/O Expander support Samuel Ortiz
2010-06-19 13:50 ` Luotao Fu
2010-06-21 13:33 ` Rabin VINCENT
2010-06-21 15:45 ` Luotao Fu
2010-06-22 13:55 ` [PATCHv2 1/3] mfd: add STMPE " Rabin Vincent
2010-06-27 23:55 ` Samuel Ortiz
2010-06-29 3:13 ` Rabin VINCENT
2010-06-29 15:33 ` Samuel Ortiz
2010-07-01 12:00 ` [PATCHv3 " Rabin Vincent
2010-07-01 12:34 ` Luotao Fu
2010-07-02 11:22 ` [PATCHv4 " Rabin Vincent
2010-07-02 15:31 ` Samuel Ortiz
2010-07-02 11:22 ` [PATCHv4 2/3] gpio: add STMPE GPIO driver Rabin Vincent
2010-07-02 11:22 ` [PATCHv4 3/3] input: add STMPE keypad driver Rabin Vincent
2010-07-02 12:10 ` [RESEND] [PATCH V8] input: STMPE touch controller support Luotao Fu
2010-07-05 14:53 ` Samuel Ortiz
2010-07-01 12:00 ` [PATCHv3 2/3] gpio: add STMPE GPIO driver Rabin Vincent
2010-07-01 12:29 ` Luotao Fu
2010-07-01 12:00 ` [PATCHv3 3/3] input: add STMPE keypad driver Rabin Vincent
2010-06-22 13:55 ` [PATCHv2 2/3] gpio: add STMPE GPIO driver Rabin Vincent
2010-06-22 13:55 ` [PATCHv2 3/3] input: add STMPE keypad driver Rabin Vincent
2010-06-22 13:56 ` [PATCH 1/3] mfd: add STMPExxxx I/O Expander support Rabin VINCENT
2010-06-24 11:13 ` mfd: STMPExxxx fixes and touch screen support Luotao Fu
2010-06-24 11:13 ` [PATCH 1/6] gpio/stmpe-gpio: set GPIO alternate function while requesting Luotao Fu
2010-06-24 12:43 ` Rabin VINCENT
2010-06-24 11:13 ` [PATCH 2/6] gpio/stmpe-gpio: fix set direction input Luotao Fu
2010-06-24 12:03 ` Rabin VINCENT
2010-06-24 11:13 ` [PATCH 3/6] mfd/stmpexxx: add touchscreen platform data Luotao Fu
2010-06-24 11:13 ` [PATCH 4/6] mfd/stmpexxx: change touchscreen irq Luotao Fu
2010-06-24 13:09 ` Rabin VINCENT
2010-06-24 13:17 ` Luotao Fu
2010-06-24 11:13 ` [PATCH 5/6] mfd/stmpexxx: fix stmpe811 enable hook Luotao Fu
2010-06-24 12:11 ` Rabin VINCENT
2010-06-24 12:32 ` Luotao Fu
2010-06-24 12:47 ` [PATCH 5/6 V3] " Luotao Fu
2010-06-24 13:05 ` Rabin VINCENT
2010-06-24 11:13 ` [PATCH 6/6 V4] input: STMPE touch controller support Luotao Fu
2010-06-24 12:27 ` Luotao Fu [this message]
2010-06-24 12:35 ` [PATCH 5/6 V2] mfd/stmpexxx: fix stmpe811 enable hook Rabin VINCENT
2010-06-24 12:46 ` Luotao Fu
2010-06-24 12:28 ` [PATCH 6/6 V5] input: STMPE touch controller support Luotao Fu
2010-06-24 14:26 ` [PATCH 5/5] " Luotao Fu
2010-06-24 16:24 ` Dmitry Torokhov
2010-06-24 16:57 ` Luotao Fu
2010-06-25 8:37 ` [PATCH 5/5 V7] " Luotao Fu
2010-06-25 9:11 ` Dmitry Torokhov
2010-06-25 9:32 ` Luotao Fu
2010-06-27 21:24 ` Samuel Ortiz
2010-06-25 9:34 ` [PATCH 5/5 V8] " Luotao Fu
2010-06-24 12:31 ` [PATCH 6/6 V4] " Rabin VINCENT
2010-06-24 12:42 ` Luotao Fu
2010-06-24 13:01 ` Rabin VINCENT
2010-06-24 13:11 ` Luotao Fu
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=1277382466-23603-1-git-send-email-l.fu@pengutronix.de \
--to=l.fu@pengutronix.de \
--cc=STEricsson_nomadik_linux@list.st.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linus.walleij@stericsson.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rabin.vincent@stericsson.com \
--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: 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).