From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>
Cc: linux-kernel@vger.kernel.org,
patches@opensource.wolfsonmicro.com,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 01/16] mfd: wm5102: Add registers for microphone detection level configuration
Date: Tue, 2 Apr 2013 12:32:33 +0100 [thread overview]
Message-ID: <1364902368-1123-1-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20130402113157.GJ23065@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/mfd/wm5102-tables.c | 8 ++++++++
include/linux/mfd/arizona/registers.h | 4 ++++
2 files changed, 12 insertions(+)
diff --git a/drivers/mfd/wm5102-tables.c b/drivers/mfd/wm5102-tables.c
index a433f58..ca2aed6 100644
--- a/drivers/mfd/wm5102-tables.c
+++ b/drivers/mfd/wm5102-tables.c
@@ -331,6 +331,10 @@ static const struct reg_default wm5102_reg_default[] = {
{ 0x000002A3, 0x1102 }, /* R675 - Mic Detect 1 */
{ 0x000002A4, 0x009F }, /* R676 - Mic Detect 2 */
{ 0x000002A5, 0x0000 }, /* R677 - Mic Detect 3 */
+ { 0x000002A6, 0x3737 }, /* R678 - Mic Detect Level 1 */
+ { 0x000002A7, 0x372C }, /* R679 - Mic Detect Level 2 */
+ { 0x000002A8, 0x1422 }, /* R680 - Mic Detect Level 3 */
+ { 0x000002A9, 0x030A }, /* R681 - Mic Detect Level 4 */
{ 0x000002C3, 0x0000 }, /* R707 - Mic noise mix control 1 */
{ 0x000002CB, 0x0000 }, /* R715 - Isolation control */
{ 0x000002D3, 0x0000 }, /* R723 - Jack detect analogue */
@@ -1090,6 +1094,10 @@ static bool wm5102_readable_register(struct device *dev, unsigned int reg)
case ARIZONA_MIC_DETECT_1:
case ARIZONA_MIC_DETECT_2:
case ARIZONA_MIC_DETECT_3:
+ case ARIZONA_MIC_DETECT_LEVEL_1:
+ case ARIZONA_MIC_DETECT_LEVEL_2:
+ case ARIZONA_MIC_DETECT_LEVEL_3:
+ case ARIZONA_MIC_DETECT_LEVEL_4:
case ARIZONA_MIC_NOISE_MIX_CONTROL_1:
case ARIZONA_ISOLATION_CONTROL:
case ARIZONA_JACK_DETECT_ANALOGUE:
diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
index 3403551..f43aa7c 100644
--- a/include/linux/mfd/arizona/registers.h
+++ b/include/linux/mfd/arizona/registers.h
@@ -124,6 +124,10 @@
#define ARIZONA_MIC_DETECT_1 0x2A3
#define ARIZONA_MIC_DETECT_2 0x2A4
#define ARIZONA_MIC_DETECT_3 0x2A5
+#define ARIZONA_MIC_DETECT_LEVEL_1 0x2A6
+#define ARIZONA_MIC_DETECT_LEVEL_2 0x2A7
+#define ARIZONA_MIC_DETECT_LEVEL_3 0x2A8
+#define ARIZONA_MIC_DETECT_LEVEL_4 0x2A9
#define ARIZONA_MIC_NOISE_MIX_CONTROL_1 0x2C3
#define ARIZONA_ISOLATION_CONTROL 0x2CB
#define ARIZONA_JACK_DETECT_ANALOGUE 0x2D3
--
1.7.10.4
next prev parent reply other threads:[~2013-04-02 11:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-02 11:31 [PATCH 0/16] extcon: arizona: Updates for v3.10 Mark Brown
2013-04-02 11:32 ` Mark Brown [this message]
2013-04-02 11:32 ` [PATCH 02/16] extcon: arizona: Attempt more microphone measurements Mark Brown
2013-04-02 11:32 ` [PATCH 03/16] extcon: arizona: Allow configuration of button detection Mark Brown
2013-04-02 11:32 ` [PATCH 04/16] extcon: arizona: Don't pulse MICBIAS for HPDET identification Mark Brown
2013-04-02 11:32 ` [PATCH 05/16] extcon: arizona: Allow pull to be disabled on GPIO5 when used for JACKET Mark Brown
2013-04-02 11:32 ` [PATCH 06/16] extcon: arizona: Raise minimum microphone impedance for HPDET method Mark Brown
2013-04-02 11:32 ` [PATCH 07/16] extcon: arizona: Suppress duplicate JACKDET reports Mark Brown
2013-04-02 11:32 ` [PATCH 08/16] extcon: arizona: Check we report a valid impedance Mark Brown
2013-04-02 11:32 ` [PATCH 09/16] extcon: arizona: Tune up HPDET debounce Mark Brown
2013-04-02 11:32 ` [PATCH 10/16] extcon: arizona: Retry HPDET identification for high impedance Mark Brown
2013-04-02 11:32 ` [PATCH 11/16] extcon: arizona: Don't ground flip when using HPDET identification Mark Brown
2013-04-02 11:32 ` [PATCH 12/16] extcon: arizona: Simplify HPDET based identification Mark Brown
2013-04-02 11:32 ` [PATCH 13/16] extcon: arizona: Time out if MICDET fails to report Mark Brown
2013-04-02 11:32 ` [PATCH 14/16] extcon: arizona: Clear existing button reports before reporting new one Mark Brown
2013-04-02 11:32 ` [PATCH 15/16] extcon: arizona: Allow additional debounce during microphone detection Mark Brown
2013-04-02 11:32 ` [PATCH 16/16] extcon: arizona: Make mic detection timeout configurable Mark Brown
2013-04-03 18:33 ` [PATCH 0/16] extcon: arizona: Updates for v3.10 Greg Kroah-Hartman
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=1364902368-1123-1-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=cw00.choi@samsung.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=patches@opensource.wolfsonmicro.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