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

Commit 1ce37689 authored by Charles Keepax's avatar Charles Keepax Committed by Chanwoo Choi
Browse files

mfd: arizona: Add register bits for general purpose switch 



The switch is typically used in conjunction with the MICDET clamp in
order to suppress pops and clicks associated with jack insertion.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent e76e397a

drivers/mfd/wm5110-tables.c

+2 −0
Original line number Diff line number Diff line
@@ -1481,6 +1481,7 @@ static const struct reg_default wm5110_reg_default[] = { 
	{ 0x00000C04, 0xA101 },    /* R3076  - GPIO5 CTRL */

	{ 0x00000C0F, 0x0400 },    /* R3087  - IRQ CTRL 1 */

	{ 0x00000C10, 0x1000 },    /* R3088  - GPIO Debounce Config */

	{ 0x00000C18, 0x0000 },    /* R3096  - GP Switch 1 */

	{ 0x00000C20, 0x8002 },    /* R3104  - Misc Pad Ctrl 1 */

	{ 0x00000C21, 0x8001 },    /* R3105  - Misc Pad Ctrl 2 */

	{ 0x00000C22, 0x0000 },    /* R3106  - Misc Pad Ctrl 3 */
@@ -2528,6 +2529,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg) 
	case ARIZONA_GPIO5_CTRL:

	case ARIZONA_IRQ_CTRL_1:

	case ARIZONA_GPIO_DEBOUNCE_CONFIG:

	case ARIZONA_GP_SWITCH_1:

	case ARIZONA_MISC_PAD_CTRL_1:

	case ARIZONA_MISC_PAD_CTRL_2:

	case ARIZONA_MISC_PAD_CTRL_3:

include/linux/mfd/arizona/pdata.h

+3 −0
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ struct arizona_pdata { 


	/** GPIO for primary IRQ (used for edge triggered emulation) */

	int irq_gpio;



	/** General purpose switch control */

	unsigned int gpsw;

};



#endif