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

Commit 80e1dd82 authored by Linus Walleij's avatar Linus Walleij Committed by Dmitry Torokhov
Browse files

mfd: stmpe: add pull up/down register offsets for STMPE 



This adds the register offsets for pull up/down for the STMPE
1601, 1801 and 24xx expanders. This is used to bias GPIO lines
and keypad lines.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent baf332c0

drivers/mfd/stmpe.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -519,6 +519,7 @@ static const u8 stmpe1601_regs[] = { 
	[STMPE_IDX_GPDR_LSB]	= STMPE1601_REG_GPIO_SET_DIR_LSB,

	[STMPE_IDX_GPDR_LSB]	= STMPE1601_REG_GPIO_SET_DIR_LSB,

	[STMPE_IDX_GPRER_LSB]	= STMPE1601_REG_GPIO_RE_LSB,

	[STMPE_IDX_GPRER_LSB]	= STMPE1601_REG_GPIO_RE_LSB,

	[STMPE_IDX_GPFER_LSB]	= STMPE1601_REG_GPIO_FE_LSB,

	[STMPE_IDX_GPFER_LSB]	= STMPE1601_REG_GPIO_FE_LSB,

	[STMPE_IDX_GPPUR_LSB]	= STMPE1601_REG_GPIO_PU_LSB,

	[STMPE_IDX_GPAFR_U_MSB]	= STMPE1601_REG_GPIO_AF_U_MSB,

	[STMPE_IDX_GPAFR_U_MSB]	= STMPE1601_REG_GPIO_AF_U_MSB,

	[STMPE_IDX_IEGPIOR_LSB]	= STMPE1601_REG_INT_EN_GPIO_MASK_LSB,

	[STMPE_IDX_IEGPIOR_LSB]	= STMPE1601_REG_INT_EN_GPIO_MASK_LSB,

	[STMPE_IDX_ISGPIOR_MSB]	= STMPE1601_REG_INT_STA_GPIO_MSB,

	[STMPE_IDX_ISGPIOR_MSB]	= STMPE1601_REG_INT_STA_GPIO_MSB,
@@ -667,6 +668,7 @@ static const u8 stmpe1801_regs[] = { 
	[STMPE_IDX_GPDR_LSB]	= STMPE1801_REG_GPIO_SET_DIR_LOW,

	[STMPE_IDX_GPDR_LSB]	= STMPE1801_REG_GPIO_SET_DIR_LOW,

	[STMPE_IDX_GPRER_LSB]	= STMPE1801_REG_GPIO_RE_LOW,

	[STMPE_IDX_GPRER_LSB]	= STMPE1801_REG_GPIO_RE_LOW,

	[STMPE_IDX_GPFER_LSB]	= STMPE1801_REG_GPIO_FE_LOW,

	[STMPE_IDX_GPFER_LSB]	= STMPE1801_REG_GPIO_FE_LOW,

	[STMPE_IDX_GPPUR_LSB]	= STMPE1801_REG_GPIO_PULL_UP_LOW,

	[STMPE_IDX_IEGPIOR_LSB]	= STMPE1801_REG_INT_EN_GPIO_MASK_LOW,

	[STMPE_IDX_IEGPIOR_LSB]	= STMPE1801_REG_INT_EN_GPIO_MASK_LOW,

	[STMPE_IDX_ISGPIOR_LSB]	= STMPE1801_REG_INT_STA_GPIO_LOW,

	[STMPE_IDX_ISGPIOR_LSB]	= STMPE1801_REG_INT_STA_GPIO_LOW,

};

};
@@ -750,6 +752,8 @@ static const u8 stmpe24xx_regs[] = { 
	[STMPE_IDX_GPDR_LSB]	= STMPE24XX_REG_GPDR_LSB,

	[STMPE_IDX_GPDR_LSB]	= STMPE24XX_REG_GPDR_LSB,

	[STMPE_IDX_GPRER_LSB]	= STMPE24XX_REG_GPRER_LSB,

	[STMPE_IDX_GPRER_LSB]	= STMPE24XX_REG_GPRER_LSB,

	[STMPE_IDX_GPFER_LSB]	= STMPE24XX_REG_GPFER_LSB,

	[STMPE_IDX_GPFER_LSB]	= STMPE24XX_REG_GPFER_LSB,

	[STMPE_IDX_GPPUR_LSB]	= STMPE24XX_REG_GPPUR_LSB,

	[STMPE_IDX_GPPDR_LSB]	= STMPE24XX_REG_GPPDR_LSB,

	[STMPE_IDX_GPAFR_U_MSB]	= STMPE24XX_REG_GPAFR_U_MSB,

	[STMPE_IDX_GPAFR_U_MSB]	= STMPE24XX_REG_GPAFR_U_MSB,

	[STMPE_IDX_IEGPIOR_LSB]	= STMPE24XX_REG_IEGPIOR_LSB,

	[STMPE_IDX_IEGPIOR_LSB]	= STMPE24XX_REG_IEGPIOR_LSB,

	[STMPE_IDX_ISGPIOR_MSB]	= STMPE24XX_REG_ISGPIOR_MSB,

	[STMPE_IDX_ISGPIOR_MSB]	= STMPE24XX_REG_ISGPIOR_MSB,

drivers/mfd/stmpe.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -188,6 +188,7 @@ int stmpe_remove(struct stmpe *stmpe); 
#define STMPE1601_REG_GPIO_ED_MSB		0x8A

#define STMPE1601_REG_GPIO_ED_MSB		0x8A

#define STMPE1601_REG_GPIO_RE_LSB		0x8D

#define STMPE1601_REG_GPIO_RE_LSB		0x8D

#define STMPE1601_REG_GPIO_FE_LSB		0x8F

#define STMPE1601_REG_GPIO_FE_LSB		0x8F

#define STMPE1601_REG_GPIO_PU_LSB		0x91

#define STMPE1601_REG_GPIO_AF_U_MSB		0x92

#define STMPE1601_REG_GPIO_AF_U_MSB		0x92





#define STMPE1601_SYS_CTRL_ENABLE_GPIO		(1 << 3)

#define STMPE1601_SYS_CTRL_ENABLE_GPIO		(1 << 3)
@@ -276,6 +277,8 @@ int stmpe_remove(struct stmpe *stmpe); 
#define STMPE24XX_REG_GPEDR_MSB		0x8C

#define STMPE24XX_REG_GPEDR_MSB		0x8C

#define STMPE24XX_REG_GPRER_LSB		0x91

#define STMPE24XX_REG_GPRER_LSB		0x91

#define STMPE24XX_REG_GPFER_LSB		0x94

#define STMPE24XX_REG_GPFER_LSB		0x94

#define STMPE24XX_REG_GPPUR_LSB		0x97

#define STMPE24XX_REG_GPPDR_LSB		0x9a

#define STMPE24XX_REG_GPAFR_U_MSB	0x9B

#define STMPE24XX_REG_GPAFR_U_MSB	0x9B





#define STMPE24XX_SYS_CTRL_ENABLE_GPIO		(1 << 3)

#define STMPE24XX_SYS_CTRL_ENABLE_GPIO		(1 << 3)

include/linux/mfd/stmpe.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,8 @@ enum { 
	STMPE_IDX_GPEDR_MSB,

	STMPE_IDX_GPEDR_MSB,

	STMPE_IDX_GPRER_LSB,

	STMPE_IDX_GPRER_LSB,

	STMPE_IDX_GPFER_LSB,

	STMPE_IDX_GPFER_LSB,

	STMPE_IDX_GPPUR_LSB,

	STMPE_IDX_GPPDR_LSB,

	STMPE_IDX_GPAFR_U_MSB,

	STMPE_IDX_GPAFR_U_MSB,

	STMPE_IDX_IEGPIOR_LSB,

	STMPE_IDX_IEGPIOR_LSB,

	STMPE_IDX_ISGPIOR_LSB,

	STMPE_IDX_ISGPIOR_LSB,