Re: [PATCH 3/9] mfd: arizona: Add TST_CAP bits for headphone detection

Lee Jones
2015-09-20T04:21:55Z

On Wed, 16 Sep 2015, Charles Keepax wrote:

> 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: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/wm5110-tables.c | 2 ++
> include/linux/mfd/arizona/registers.h | 8 ++++++++
> 2 files changed, 10 insertions(+), 0 deletions(-)

Acked-by: Lee Jones <lee.jones@linaro.org>

> diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c
> index aae17d6..28f2ae3 100644
> --- a/drivers/mfd/wm5110-tables.c
> +++ b/drivers/mfd/wm5110-tables.c
> @@ -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:
> diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
> index ab219c9..c7c11c9 100644
> --- a/include/linux/mfd/arizona/registers.h
> +++ b/include/linux/mfd/arizona/registers.h
> @@ -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
> @@ -3702,6 +3703,13 @@
> #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
> */
> #define ARIZONA_OUT_COMP_COEFF_MASK 0xFFFF /* OUT_COMP_COEFF - [15:0] */

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog