From mboxrd@z Thu Jan 1 00:00:00 1970 From: Luotao Fu Subject: [PATCH 5/6 V3] mfd/stmpexxx: fix stmpe811 enable hook Date: Thu, 24 Jun 2010 14:47:58 +0200 Message-ID: <1277383678-4973-1-git-send-email-l.fu@pengutronix.de> References: <20100624123211.GB3988@pengutronix.de> Return-path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:35332 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755162Ab0FXMsF (ORCPT ); Thu, 24 Jun 2010 08:48:05 -0400 In-Reply-To: <20100624123211.GB3988@pengutronix.de> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Rabin VINCENT , Samuel Ortiz , Dmitry Torokhov Cc: Linus WALLEIJ , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, STEricsson_nomadik_linux , Luotao Fu Fix the stmpe811 enable hook so that we can activate the needed clocks for the touchscreen controller. Signed-off-by: Luotao Fu --- 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