Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 09:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Staging: mrst-touchscreen - simplify en/disable of interrupts for NEC

Browse Source 
Use 8 bit update commands instead of a 16 bit unaligned read/write
pair which fails after the first few calls; the voodoo in the original
doesn't seem to be required with this mechanism.

Tested-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andy Ross <andy.ross@windriver.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Andy Ross 2010-08-31 23:00:41 -07:00 committed by Dmitry Torokhov
parent 409d568dc5
commit a9cfa2537c
1 changed files with 5 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/staging/mrst-touchscreen/intel-mid-touch.c
View File

@ -113,17 +113,7 @@ struct mrstouch_dev {
static int mrstouch_nec_adc_read_prepare(struct mrstouch_dev *tsdev)
{
u16 reg;
int err;
err = intel_scu_ipc_ioread16(PMIC_REG_MADCINT, &reg);
if (err)
return err;
reg &= 0xDFFF; /* Disable pendet */
/* Set MADCINT and update ADCCNTL1 (next reg byte) */
return intel_scu_ipc_iowrite16(PMIC_REG_MADCINT, reg);
return intel_scu_ipc_update_register(PMIC_REG_MADCINT, 0, 0x20);
}
/*
@ -131,53 +121,13 @@ static int mrstouch_nec_adc_read_prepare(struct mrstouch_dev *tsdev)
*/
static int mrstouch_nec_adc_read_finish(struct mrstouch_dev *tsdev)
{
u16 reg;
u8 r;
u8 pendet_enabled;
int retry = 0;
int err;
err = intel_scu_ipc_ioread16(PMIC_REG_MADCINT, &reg);
if (err)
err = intel_scu_ipc_update_register(PMIC_REG_MADCINT, 0x20, 0x20);
if (!err)
err = intel_scu_ipc_update_register(PMIC_REG_ADCCNTL1, 0, 0x05);
return err;
reg &= ~0x0005;
reg |= 0x2000; /* Enable pendet */
/* Set MADCINT and update ADCCNTL1 (next reg byte) */
err = intel_scu_ipc_iowrite16(PMIC_REG_MADCINT, reg);
if (err)
return err;
/*
* Sometimes even after the register write succeeds
* the PMIC register value is not updated. Retry few iterations
* to enable pendet.
*/
do {
err = intel_scu_ipc_ioread8(PMIC_REG_ADCCNTL1, &r);
if (err)
return err;
pendet_enabled = (r >> 5) & 0x01;
if (!pendet_enabled) {
if (++retry >= 10) {
dev_err(tsdev->dev,
"Touch screen disabled.\n");
return -EIO;
}
msleep(10);
err = intel_scu_ipc_iowrite8(PMIC_REG_ADCCNTL1,
reg >> 8);
if (err)
return err;
}
} while (!pendet_enabled);
return 0;
}
/*