mfd/stmpexxx: fix stmpe811 enable hook
in [Kernel]
|
From: Rabin VINCENT on 24 Jun 2010 08:20 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(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; 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 -- 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/
From: Rabin VINCENT on 24 Jun 2010 08:40 On Thu, Jun 24, 2010 at 14:27:46 +0200, Luotao Fu wrote: > diff --git a/drivers/mfd/stmpe-devices.c b/drivers/mfd/stmpe-devices.c > index 3e21c26..ded9dcb 100644 > --- a/drivers/mfd/stmpe-devices.c > +++ b/drivers/mfd/stmpe-devices.c > @@ -117,8 +117,8 @@ 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; > You shouldn't be changing TSC_OFF to ADC_OFF, since you're making this for the touchscreen. Rabin -- 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/
From: Luotao Fu on 24 Jun 2010 08:40 On Thu, Jun 24, 2010 at 05:41:00PM +0530, Rabin VINCENT wrote: > 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(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; > > 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. agreed, this would be more clear. Just sent the V2 of this fix and V5 of the ts driver. I Btw mixed message IDs up and the V2 of the enable hook fix went out with the same "reply to" ID as the ts driver. doh! sorry for the confusion. cheers Luotao Fu -- Pengutronix e.K. | Dipl.-Ing. Luotao Fu | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
From: Luotao Fu on 24 Jun 2010 08:50 On Thu, Jun 24, 2010 at 06:05:42PM +0530, Rabin VINCENT wrote: > On Thu, Jun 24, 2010 at 14:27:46 +0200, Luotao Fu wrote: > > diff --git a/drivers/mfd/stmpe-devices.c b/drivers/mfd/stmpe-devices.c > > index 3e21c26..ded9dcb 100644 > > --- a/drivers/mfd/stmpe-devices.c > > +++ b/drivers/mfd/stmpe-devices.c > > @@ -117,8 +117,8 @@ 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; > > > > You shouldn't be changing TSC_OFF to ADC_OFF, since you're making this > for the touchscreen. > doh! I need more coffee. This is truly embarassing. :-) Proper fix in following. cheers Luotao Fu -- Pengutronix e.K. | Dipl.-Ing. Luotao Fu | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
From: Rabin VINCENT on 24 Jun 2010 09:10 On Thu, Jun 24, 2010 at 14:47:58 +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(a)pengutronix.de> Acked-by: Rabin Vincent <rabin.vincent(a)stericsson.com> -- 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/
|
Pages: 1 Prev: gpio/stmpe-gpio: fix set direction input Next: kernel hangs |