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

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

mfd: stmpe: Use generic bit mask name 



In order to prepare the ground to STMPE1600,
as STMPE1600's SYS_CTRL register has the same layout as
STMPE801 variant, unify STMPExxx_REG_SYS_CTRL_RESET/INT_EN/INT_HI
bit masks to more generic STMPE_SYS_CTRL_RESET/INT_EN/INT_HI

Signed-off-by: default avatarPatrice Chotard <patrice.chotard@st.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 6936e1f8

drivers/mfd/stmpe.c

+2 −2
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ static int stmpe_chip_init(struct stmpe *stmpe) 


	if (stmpe->irq >= 0) {

		if (id == STMPE801_ID)

			icr = STMPE801_REG_SYS_CTRL_INT_EN;

			icr = STMPE_SYS_CTRL_INT_EN;

		else

			icr = STMPE_ICR_LSB_GIM;
@@ -1124,7 +1124,7 @@ static int stmpe_chip_init(struct stmpe *stmpe) 
		if (irq_trigger == IRQF_TRIGGER_RISING ||

				irq_trigger == IRQF_TRIGGER_HIGH) {

			if (id == STMPE801_ID)

				icr |= STMPE801_REG_SYS_CTRL_INT_HI;

				icr |= STMPE_SYS_CTRL_INT_HI;

			else

				icr |= STMPE_ICR_LSB_HIGH;

		}

drivers/mfd/stmpe.h

+2 −4
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ int stmpe_remove(struct stmpe *stmpe); 
#define STMPE_ICR_LSB_GIM	(1 << 0)



#define STMPE_SYS_CTRL_RESET	(1 << 7)

#define STMPE_SYS_CTRL_INT_EN	(1 << 2)

#define STMPE_SYS_CTRL_INT_HI	(1 << 0)



/*

 * STMPE801
@@ -121,10 +123,6 @@ int stmpe_remove(struct stmpe *stmpe); 
#define STMPE801_REG_GPIO_SET_PIN	0x11

#define STMPE801_REG_GPIO_DIR		0x12



#define STMPE801_REG_SYS_CTRL_RESET	(1 << 7)

#define STMPE801_REG_SYS_CTRL_INT_EN	(1 << 2)

#define STMPE801_REG_SYS_CTRL_INT_HI	(1 << 0)



/*

 * STMPE811

 */