[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1277383678-4973-1-git-send-email-l.fu@pengutronix.de>
Date: Thu, 24 Jun 2010 14:47:58 +0200
From: Luotao Fu <l.fu@...gutronix.de>
To: Rabin VINCENT <rabin.vincent@...ricsson.com>,
Samuel Ortiz <sameo@...ux.intel.com>,
Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc: Linus WALLEIJ <linus.walleij@...ricsson.com>,
linux-kernel@...r.kernel.org, linux-input@...r.kernel.org,
STEricsson_nomadik_linux <STEricsson_nomadik_linux@...t.st.com>,
Luotao Fu <l.fu@...gutronix.de>
Subject: [PATCH 5/6 V3] mfd/stmpexxx: fix stmpe811 enable hook
Fix the stmpe811 enable hook so that we can activate the needed clocks for the
touchscreen controller.
Signed-off-by: Luotao Fu <l.fu@...gutronix.de>
---
V2 Changes:
separate ADC block enable and ts block enable.
V3 Changes:
fixed silly typo
drivers/mfd/stmpe-devices.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/stmpe-devices.c b/drivers/mfd/stmpe-devices.c
index 3e21c26..066cab5 100644
--- a/drivers/mfd/stmpe-devices.c
+++ b/drivers/mfd/stmpe-devices.c
@@ -117,7 +117,7 @@ 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)
+ if (blocks & STMPE_BLOCK_TOUCHSCREEN)
mask |= STMPE811_SYS_CTRL2_TSC_OFF;
return stmpe_set_bits(stmpe, STMPE811_REG_SYS_CTRL2, mask,
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists