[PATCH 5/6] mfd/stmpexxx: fix stmpe811 enable hook
in [Kernel]
|
Prev: mm: iommu: An API to unify IOMMU, CPU and device memory management
Next: mfd: STMPExxxx fixes and touch screen support
From: Luotao Fu on 24 Jun 2010 07:20 Fix the stmpe811 enable hook so that we can activate the needed clocks for the touchscreen controller. Signed-off-by: Luotao Fu <l.fu(a)pengutronix.de> --- drivers/mfd/stmpe-devices.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/stmpe-devices.c b/drivers/mfd/stmpe-devices.c index 3e21c26..25941ea 100644 --- a/drivers/mfd/stmpe-devices.c +++ b/drivers/mfd/stmpe-devices.c @@ -117,8 +117,9 @@ 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 + | STMPE811_SYS_CTRL2_TSC_OFF; return stmpe_set_bits(stmpe, STMPE811_REG_SYS_CTRL2, mask, enable ? 0 : mask); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |