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

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

mfd: arizona: Add TST_CAP bits for headphone detection 



On wm5110/8280 some additional settings are required to get accurate
measurements at the top end of the headphone detection range. This patch
adds the bits required for this.

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 1ce37689

drivers/mfd/wm5110-tables.c

+2 −0
Original line number Diff line number Diff line
@@ -1912,6 +1912,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg) 
	case ARIZONA_HP1_SHORT_CIRCUIT_CTRL:

	case ARIZONA_HP2_SHORT_CIRCUIT_CTRL:

	case ARIZONA_HP3_SHORT_CIRCUIT_CTRL:

	case ARIZONA_HP_TEST_CTRL_1:

	case ARIZONA_AIF1_BCLK_CTRL:

	case ARIZONA_AIF1_TX_PIN_CTRL:

	case ARIZONA_AIF1_RX_PIN_CTRL:
@@ -2857,6 +2858,7 @@ static bool wm5110_volatile_register(struct device *dev, unsigned int reg) 
	case ARIZONA_INPUT_ENABLES_STATUS:

	case ARIZONA_OUTPUT_STATUS_1:

	case ARIZONA_RAW_OUTPUT_STATUS_1:

	case ARIZONA_HP_TEST_CTRL_1:

	case ARIZONA_SLIMBUS_RX_PORT_STATUS:

	case ARIZONA_SLIMBUS_TX_PORT_STATUS:

	case ARIZONA_INTERRUPT_STATUS_1:

include/linux/mfd/arizona/registers.h

+8 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ 
#define ARIZONA_HP1_SHORT_CIRCUIT_CTRL           0x4A0

#define ARIZONA_HP2_SHORT_CIRCUIT_CTRL           0x4A1

#define ARIZONA_HP3_SHORT_CIRCUIT_CTRL           0x4A2

#define ARIZONA_HP_TEST_CTRL_1                   0x4A4

#define ARIZONA_SPK_CTRL_2                       0x4B5

#define ARIZONA_SPK_CTRL_3                       0x4B6

#define ARIZONA_DAC_COMP_1                       0x4DC
@@ -3701,6 +3702,13 @@ 
#define ARIZONA_HP3_SC_ENA_SHIFT                     12  /* HP3_SC_ENA */

#define ARIZONA_HP3_SC_ENA_WIDTH                      1  /* HP3_SC_ENA */



/*

 * R1188 (0x4A4) HP Test Ctrl 1

 */

#define ARIZONA_HP1_TST_CAP_SEL_MASK             0x0003  /* HP1_TST_CAP_SEL - [1:0] */

#define ARIZONA_HP1_TST_CAP_SEL_SHIFT                 0  /* HP1_TST_CAP_SEL - [1:0] */

#define ARIZONA_HP1_TST_CAP_SEL_WIDTH                 2  /* HP1_TST_CAP_SEL - [1:0] */



/*

 * R1244 (0x4DC) - DAC comp 1

 */