Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4dd1ba3 authored by Patrice Chotard's avatar Patrice Chotard Committed by Lee Jones
Browse files

mfd: stmpe: Add reset support for all STMPE variant 



Reset was only implemented for STMPE1801 variant despite
all variant have a SOFT_RESET bit.

For STMPE2401/2403/801/1601/1801 SOFT_RESET bit is bit 7
of SYS_CTRL register.
For STMPE610/811 (which have the same variant id) SOFT_RESET
bit is bit 1 of SYS_CTRL register.

Signed-off-by: default avatarPatrice Chotard <patrice.chotard@st.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 0f4be8cf

drivers/mfd/stmpe.c

+15 −8
Original line number Diff line number Diff line
@@ -756,13 +756,22 @@ static int stmpe1801_enable(struct stmpe *stmpe, unsigned int blocks, 
				enable ? mask : 0);

}



static int stmpe1801_reset(struct stmpe *stmpe)

static int stmpe_reset(struct stmpe *stmpe)

{

	u16 id_val = stmpe->variant->id_val;

	unsigned long timeout;

	int ret = 0;

	u8 reset_bit;



	if (id_val == STMPE811_ID)

		/* STMPE801 and STMPE610 use bit 1 of SYS_CTRL register */

		reset_bit = STMPE811_SYS_CTRL_RESET;

	else

		/* all other STMPE variant use bit 7 of SYS_CTRL register */

		reset_bit = STMPE_SYS_CTRL_RESET;



	ret = __stmpe_set_bits(stmpe, stmpe->regs[STMPE_IDX_SYS_CTRL],

		STMPE1801_MSK_SYS_CTRL_RESET, STMPE1801_MSK_SYS_CTRL_RESET);

			       reset_bit, reset_bit);

	if (ret < 0)

		return ret;
@@ -771,7 +780,7 @@ static int stmpe1801_reset(struct stmpe *stmpe) 
		ret = __stmpe_reg_read(stmpe, stmpe->regs[STMPE_IDX_SYS_CTRL]);

		if (ret < 0)

			return ret;

		if (!(ret & STMPE1801_MSK_SYS_CTRL_RESET))

		if (!(ret & reset_bit))

			return 0;

		usleep_range(100, 200);

	}
@@ -1095,11 +1104,9 @@ static int stmpe_chip_init(struct stmpe *stmpe) 
	if (ret)

		return ret;



	if (id == STMPE1801_ID)	{

		ret =  stmpe1801_reset(stmpe);

	ret =  stmpe_reset(stmpe);

	if (ret < 0)

		return ret;

	}



	if (stmpe->irq >= 0) {

		if (id == STMPE801_ID)

drivers/mfd/stmpe.h

+5 −2
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ int stmpe_remove(struct stmpe *stmpe); 
#define STMPE_ICR_LSB_EDGE	(1 << 1)

#define STMPE_ICR_LSB_GIM	(1 << 0)



#define STMPE_SYS_CTRL_RESET	(1 << 7)



/*

 * STMPE801

 */
@@ -126,6 +128,7 @@ int stmpe_remove(struct stmpe *stmpe); 
/*

 * STMPE811

 */

#define STMPE811_ID			0x0811



#define STMPE811_IRQ_TOUCH_DET		0

#define STMPE811_IRQ_FIFO_TH		1
@@ -155,6 +158,8 @@ int stmpe_remove(struct stmpe *stmpe); 
#define STMPE811_REG_GPIO_FE		0x16

#define STMPE811_REG_GPIO_AF		0x17



#define STMPE811_SYS_CTRL_RESET		(1 << 1)



#define STMPE811_SYS_CTRL2_ADC_OFF	(1 << 0)

#define STMPE811_SYS_CTRL2_TSC_OFF	(1 << 1)

#define STMPE811_SYS_CTRL2_GPIO_OFF	(1 << 2)
@@ -244,8 +249,6 @@ int stmpe_remove(struct stmpe *stmpe); 
#define STMPE1801_REG_GPIO_PULL_UP_MID		0x23

#define STMPE1801_REG_GPIO_PULL_UP_HIGH		0x24



#define STMPE1801_MSK_SYS_CTRL_RESET		(1 << 7)



#define STMPE1801_MSK_INT_EN_KPC		(1 << 1)

#define STMPE1801_MSK_INT_EN_GPIO		(1 << 3)