From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755143AbbITEVz (ORCPT ); Sun, 20 Sep 2015 00:21:55 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:33831 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754897AbbITERe (ORCPT ); Sun, 20 Sep 2015 00:17:34 -0400 Date: Sun, 20 Sep 2015 05:17:30 +0100 From: Lee Jones To: Charles Keepax Cc: cw00.choi@samsung.com, myungjoo.ham@samsung.com, sameo@linux.intel.com, patches@opensource.wolfsonmicro.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/9] mfd: arizona: Add TST_CAP bits for headphone detection Message-ID: <20150920041730.GJ3039@x1> References: <1442396541-7145-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> <1442396541-7145-4-git-send-email-ckeepax@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1442396541-7145-4-git-send-email-ckeepax@opensource.wolfsonmicro.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > drivers/mfd/wm5110-tables.c | 2 ++ > include/linux/mfd/arizona/registers.h | 8 ++++++++ > 2 files changed, 10 insertions(+), 0 deletions(-) Acked-by: Lee Jones > 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