Commit a9cfa253 authored by Andy Ross's avatar Andy Ross Committed by Dmitry Torokhov
Browse files

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: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarAndy Ross <andy.ross@windriver.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 409d568d

drivers/staging/mrst-touchscreen/intel-mid-touch.c

+5 −55
Original line number Diff line number Diff line
@@ -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,54 +121,14 @@ 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)

		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;

			}

	err = intel_scu_ipc_update_register(PMIC_REG_MADCINT, 0x20, 0x20);

	if (!err)

		err = intel_scu_ipc_update_register(PMIC_REG_ADCCNTL1, 0, 0x05);



			msleep(10);



			err = intel_scu_ipc_iowrite8(PMIC_REG_ADCCNTL1,

						     reg >> 8);

			if (err)

	return err;

}

	} while (!pendet_enabled);



	return 0;

}



/*

 * Reads PMIC ADC touch screen result

CRA Git | Maintained and supported by SUSTech CRA and CCSE