From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: <cw00.choi@samsung.com>, <lee.jones@linaro.org>
Cc: <myungjoo.ham@samsung.com>, <sameo@linux.intel.com>,
<patches@opensource.wolfsonmicro.com>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH 3/9] mfd: arizona: Add TST_CAP bits for headphone detection
Date: Wed, 16 Sep 2015 10:42:15 +0100 [thread overview]
Message-ID: <1442396541-7145-4-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1442396541-7145-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>
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(-)
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] */
--
1.7.2.5
next prev parent reply other threads:[~2015-09-16 10:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-16 9:42 [PATCH 0/9] Arizona Extcon Bug Fixes and Improvements Charles Keepax
2015-09-16 9:42 ` [PATCH 1/9] mfd: arizona: Add registers for ADC microphone detection Charles Keepax
2015-09-16 9:42 ` [PATCH 2/9] mfd: arizona: Add register bits for general purpose switch Charles Keepax
2015-09-16 9:42 ` Charles Keepax [this message]
2015-09-20 4:17 ` [PATCH 3/9] mfd: arizona: Add TST_CAP bits for headphone detection Lee Jones
2015-09-16 9:42 ` [PATCH 4/9] extcon: arizona: Add support for new ADC value mic detect Charles Keepax
2015-09-16 9:42 ` [PATCH 5/9] extcon: arizona: Add support for general purpose switch Charles Keepax
2015-09-16 9:42 ` [PATCH 6/9] extcon: arizona: Additional settings to improve accuracy of HP detect Charles Keepax
2015-09-16 9:42 ` [PATCH 7/9] extcon: arizona: Ignore jd_invert for MICD_CLAMP_STS Charles Keepax
2015-09-16 9:42 ` [PATCH 8/9] extcon: arizona: Use the micd_clamp for interrupts if it is available Charles Keepax
2015-09-16 9:42 ` [PATCH 9/9] extcon: arizona: Don't disable debounce for inverted jacks Charles Keepax
2015-09-25 0:05 ` [PATCH 0/9] Arizona Extcon Bug Fixes and Improvements Chanwoo Choi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1442396541-7145-4-git-send-email-ckeepax@opensource.wolfsonmicro.com \
--to=ckeepax@opensource.wolfsonmicro.com \
--cc=cw00.choi@samsung.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=patches@opensource.wolfsonmicro.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox