lkml.org 
[lkml]   [2010]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 5/6] mfd/stmpexxx: fix stmpe811 enable hook
    On Thu, Jun 24, 2010 at 13:13:40 +0200, Luotao Fu wrote:
    > 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;

    The KEYPAD -> TOUCHSCREEN fix is fine, but for the ADC, wouldn't it be
    better to pass in STMPE_BLOCK_ADC in your stmpe_enable() call instead?
    You wouldn't need to add another call, you can just pass in
    (STMPE_BLOCK_TOUCHSCREEN | STMPE_BLOCK_ADC) as the argument.

    Rabin


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