lkml.org 
[lkml]   [2010]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/6] mfd/stmpexxx: fix stmpe811 enable hook
    Date
    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>
    ---
    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


    \
     
     \ /
      Last update: 2010-06-24 13:17    [W:0.038 / U:0.028 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site