diff options
| author |   Andy Ross <andy.ross@windriver.com> | 2010-08-31 23:00:41 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-09-01 19:43:30 -0700 |
| commit | a9cfa2537c503229eed029dcb9916ffd74695f56 (patch) | |
| tree | 650e43818e6ee14fe911832c9dd6d028fe71b68f /drivers | |
| parent | Staging: mrst-touchscreen - fix channel allocation (diff) | |
| download | linux-dev-a9cfa2537c503229eed029dcb9916ffd74695f56.tar.xz linux-dev-a9cfa2537c503229eed029dcb9916ffd74695f56.zip | |
Staging: mrst-touchscreen - simplify en/disable of interrupts for NEC
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/mrst-touchscreen/intel-mid-touch.c | 60 |
1 files changed, 5 insertions, 55 deletions
diff --git a/drivers/staging/mrst-touchscreen/intel-mid-touch.c b/drivers/staging/mrst-touchscreen/intel-mid-touch.c index 2b9a7864ee71..c0307b22d86f 100644 --- a/drivers/staging/mrst-touchscreen/intel-mid-touch.c +++ b/drivers/staging/mrst-touchscreen/intel-mid-touch.c @@ -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, ®); - 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, ®); - if (err) - 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; + err = intel_scu_ipc_update_register(PMIC_REG_MADCINT, 0x20, 0x20); + if (!err) + err = intel_scu_ipc_update_register(PMIC_REG_ADCCNTL1, 0, 0x05); - 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; + return err; } /* |