From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org,
patches@opensource.wolfsonmicro.com,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 06/10] mfd: arizona: Allow customisation of microphone detection levels
Date: Sun, 27 Jan 2013 12:07:28 +0800 [thread overview]
Message-ID: <1359259652-8565-6-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1359259652-8565-1-git-send-email-broonie@opensource.wolfsonmicro.com>
The microphone detection levels for Arizona parts can be customised.
Allow this to be done via platform data, the values chosen will depend
on the system design and determined in discussion with Wolfson.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/mfd/arizona-core.c | 8 ++++++++
include/linux/mfd/arizona/pdata.h | 5 +++++
include/linux/mfd/arizona/registers.h | 4 ++++
3 files changed, 17 insertions(+)
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 1ab02a7..5f0de90 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -458,6 +458,14 @@ int arizona_dev_init(struct arizona *arizona)
arizona->pdata.gpio_defaults[i]);
}
+ for (i = 0; i < ARRAY_SIZE(arizona->pdata.micd_level); i++) {
+ if (!arizona->pdata.micd_level[i])
+ continue;
+
+ regmap_write(arizona->regmap, ARIZONA_MIC_DETECT_LEVEL_1 + i,
+ arizona->pdata.micd_level[i]);
+ }
+
pm_runtime_set_autosuspend_delay(arizona->dev, 100);
pm_runtime_use_autosuspend(arizona->dev);
pm_runtime_enable(arizona->dev);
diff --git a/include/linux/mfd/arizona/pdata.h b/include/linux/mfd/arizona/pdata.h
index 8b1d1da..73822bd 100644
--- a/include/linux/mfd/arizona/pdata.h
+++ b/include/linux/mfd/arizona/pdata.h
@@ -67,6 +67,8 @@
#define ARIZONA_MAX_PDM_SPK 2
+#define ARIZONA_NUM_MICD_LEVEL 4
+
struct regulator_init_data;
struct arizona_micd_config {
@@ -99,6 +101,9 @@ struct arizona_pdata {
/** GPIO for mic detection polarity */
int micd_pol_gpio;
+ /** Mic detect level parameters */
+ int micd_level[ARIZONA_NUM_MICD_LEVEL];
+
/** Headset polarity configurations */
struct arizona_micd_config *micd_configs;
int num_micd_configs;
diff --git a/include/linux/mfd/arizona/registers.h b/include/linux/mfd/arizona/registers.h
index 1f6fe31..fb3a1b8 100644
--- a/include/linux/mfd/arizona/registers.h
+++ b/include/linux/mfd/arizona/registers.h
@@ -122,6 +122,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-01-27 4:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-27 4:07 [PATCH 01/10] mfd: wm5102: Mark DSP memory regions as volatile and readable Mark Brown
2013-01-27 4:07 ` [PATCH 02/10] mfd: wm5102: Mark only extant DSP registers volatile Mark Brown
2013-01-27 4:07 ` [PATCH 03/10] mfd: arizona: Register MICVDD supply first to ensure no retries Mark Brown
2013-01-27 4:07 ` [PATCH 04/10] mfd: arizona: Disable control interface reporting for WM5102 and WM5110 Mark Brown
2013-01-27 4:07 ` [PATCH 05/10] mfd: arizona: Check errors from regcache_sync() Mark Brown
2013-01-27 4:07 ` Mark Brown [this message]
2013-01-27 9:44 ` [PATCH 06/10] mfd: arizona: Allow customisation of microphone detection levels Mark Brown
2013-01-27 23:56 ` Samuel Ortiz
2013-01-27 4:07 ` [PATCH 07/10] mfd: wm5102: Add registers for microphone detection level configuration Mark Brown
2013-02-03 17:00 ` Samuel Ortiz
2013-01-27 4:07 ` [PATCH 08/10] mfd: wm5102: Refresh register defaults Mark Brown
2013-02-03 17:00 ` Samuel Ortiz
2013-01-27 4:07 ` [PATCH 09/10] mfd: wm5102: Update rev B patch for latest evaluation Mark Brown
2013-01-27 4:07 ` [PATCH 10/10] mfd: arizona: Disable interrupts during resume Mark Brown
2013-02-03 17:00 ` [PATCH 01/10] mfd: wm5102: Mark DSP memory regions as volatile and readable Samuel Ortiz
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=1359259652-8565-6-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--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