Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1222831
| From | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 1/6] mfd: arizona: Add TST_CAP bits for headphone detection |
| Date | 2015-09-11 15:10 +0200 |
| Message-ID | <q7wfv-2qD-5@gated-at.bofh.it> (permalink) |
| References | <q7vMu-1Di-7@gated-at.bofh.it> <q7vMu-1Di-19@gated-at.bofh.it> <q7vW9-1Oz-11@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Florida 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> --- Changes since v2: - Removed accidental addition of Chanwoo's ack. Thanks, Charles drivers/mfd/wm5110-tables.c | 2 ++ include/linux/mfd/arizona/registers.h | 8 ++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/mfd/wm5110-tables.c b/drivers/mfd/wm5110-tables.c index acb3bb2..78032e8 100644 --- a/drivers/mfd/wm5110-tables.c +++ b/drivers/mfd/wm5110-tables.c @@ -1908,6 +1908,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: @@ -2853,6 +2854,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 e96644c..fe1b5d0 100644 --- a/include/linux/mfd/arizona/registers.h +++ b/include/linux/mfd/arizona/registers.h @@ -237,6 +237,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 @@ -3548,6 +3549,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] */ -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 0/6] Arizona extcon improvements Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2015-09-11 14:40 +0200
[PATCH v2 2/6] extcon: arizona: Additional settings to improve accuracy of HP detect Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2015-09-11 14:40 +0200
[PATCH v2 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2015-09-11 14:40 +0200
Re: [PATCH v2 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2015-09-11 14:50 +0200
[PATCH v3 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2015-09-11 15:10 +0200
Re: [PATCH v3 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Chanwoo Choi <cw00.choi@samsung.com> - 2015-09-15 06:10 +0200
Re: [PATCH v3 1/6] mfd: arizona: Add TST_CAP bits for headphone detection Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2015-09-15 12:00 +0200
[PATCH v2 5/6] extcon: arizona: Add device binding for second jack detect pin on GPIO5 Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2015-09-11 14:40 +0200
[PATCH v2 3/6] extcon: arizona: Ignore jd_invert for MICD_CLAMP_STS Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2015-09-11 14:40 +0200
[PATCH v2 4/6] extcon: arizona: Add device binding for jack detect polarity inversion Charles Keepax <ckeepax@opensource.wolfsonmicro.com> - 2015-09-11 14:50 +0200
csiph-web