Skip to contentSkip to conversation

ASoC: Allow more WM8958/WM1811 button levels with default handler

PATCH New Mark Brown 1 participant 6 messages Dec 1, 2011

Subsystems (4)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/6 ASoC: Allow more WM8958/WM1811 button levels with default handler

The WM8958 and WM1811 support detecting a range of buttons. Allow the user to provide platform data enabling more of these levels without having to write a custom detection handler.

---
 include/linux/mfd/wm8994/pdata.h |    3 ++
 sound/soc/codecs/wm8994.c        |   42 ++++++++++++++++++++++++++++++-------
 sound/soc/codecs/wm8994.h        |    1 +
 3 files changed, 38 insertions(+), 8 deletions(-)
include/linux/mfd/wm8994/pdata.h +3 -0
index b00897a..d46c55a 100644
@@ -168,6 +168,9 @@ struct wm8994_pdata {
 	/* WM8958 microphone bias configuration */
 	int micbias[2];
 
+	/* WM8958 microphone detection ranges */
+	u16 micd_lvl_sel;
+
 	/* Disable the internal pull downs on the LDOs if they are
 	 * always driven (eg, connected to an always on supply or
 	 * GPIO that always drives an output.  If they float power
sound/soc/codecs/wm8994.c +34 -8

74 lines not on this page · raw message

sound/soc/codecs/wm8994.h +1 -0
index e5e8329..8dc2c00 100644
@@ -119,6 +119,7 @@ struct wm8994_priv {
 	struct wm8994_micdet micdet[2];
 	bool detecting;
 	bool jack_mic;
+	int btn_mask;
 
 	wm8958_micdet_cb jack_cb;
 	void *jack_cb_data;
Signature · 1 line
1.7.7.3
author
#1 lore raw

PATCH 2/6 ASoC: Rename WM8994 detecting flag to mic_detecting

More specific and avoids confusion with a following change.

---
 sound/soc/codecs/wm8994.c |   12 ++++++------
 sound/soc/codecs/wm8994.h |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
sound/soc/codecs/wm8994.c +6 -6
index 68e85c6..c138937 100644
@@ -2952,7 +2952,7 @@ static void wm8958_default_micdet(u16 status, void *data)
 	if (!(status & WM8958_MICD_STS)) {
 		dev_dbg(codec->dev, "Detected open circuit\n");
 		wm8994->jack_mic = false;
-		wm8994->detecting = true;
+		wm8994->mic_detecting = true;
 
 		wm8958_micd_set_rate(codec);
 
@@ -2965,10 +2965,10 @@ static void wm8958_default_micdet(u16 status, void *data)
 	/* If the measurement is showing a high impedence we've got a
 	 * microphone.
 	 */
-	if (wm8994->detecting && (status & 0x600)) {
+	if (wm8994->mic_detecting && (status & 0x600)) {
 		dev_dbg(codec->dev, "Detected microphone\n");
 
-		wm8994->detecting = false;
+		wm8994->mic_detecting = false;
 		wm8994->jack_mic = true;
 
 		wm8958_micd_set_rate(codec);
@@ -2978,9 +2978,9 @@ static void wm8958_default_micdet(u16 status, void *data)
 	}
 
 
-	if (wm8994->detecting && status & 0x4) {
+	if (wm8994->mic_detecting && status & 0x4) {
 		dev_dbg(codec->dev, "Detected headphone\n");
-		wm8994->detecting = false;
+		wm8994->mic_detecting = false;
 
 		wm8958_micd_set_rate(codec);
 
@@ -3058,7 +3058,7 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
 		wm8994->jack_cb = cb;
 		wm8994->jack_cb_data = cb_data;
 
-		wm8994->detecting = true;
+		wm8994->mic_detecting = true;
 		wm8994->jack_mic = false;
 
 		wm8958_micd_set_rate(codec);
sound/soc/codecs/wm8994.h +1 -1
index 8dc2c00..0678f4d 100644
@@ -117,7 +117,7 @@ struct wm8994_priv {
 	struct soc_enum enh_eq_enum;
 
 	struct wm8994_micdet micdet[2];
-	bool detecting;
+	bool mic_detecting;
 	bool jack_mic;
 	int btn_mask;
 
Signature · 1 line
1.7.7.3
author
#2 lore raw

PATCH 3/6 ASoC: Implement support for WM1811A jack detection

In reply to Mark Brown

The WM1811A features an advanced low power accessory detection subsystem which allows the device to be maintained in a very low power state while the system is idle without sacrificing any accessory detection features.

Implement software support for this, automatically managing the power configuration of the device depending on the detected accessory.

---
 include/linux/mfd/wm8994/registers.h |   16 ++
 sound/soc/codecs/wm8994.c            |  264 +++++++++++++++++++++++++++++++---
 sound/soc/codecs/wm8994.h            |    3 +
 3 files changed, 264 insertions(+), 19 deletions(-)
include/linux/mfd/wm8994/registers.h +16 -0
index 8317b19..86e6a03 100644
@@ -250,6 +250,7 @@
 #define WM8994_GPIO_4                           0x703
 #define WM8994_GPIO_5                           0x704
 #define WM8994_GPIO_6                           0x705
+#define WM1811_JACKDET_CTRL			0x705
 #define WM8994_GPIO_7                           0x706
 #define WM8994_GPIO_8                           0x707
 #define WM8994_GPIO_9                           0x708
@@ -1904,6 +1905,9 @@
 /*
  * R57 (0x39) - AntiPOP (2)
  */
+#define WM1811_JACKDET_MODE_MASK                0x0180  /* JACKDET_MODE - [8:7] */
+#define WM1811_JACKDET_MODE_SHIFT                    7  /* JACKDET_MODE - [8:7] */
+#define WM1811_JACKDET_MODE_WIDTH                    2  /* JACKDET_MODE - [8:7] */
 #define WM8994_MICB2_DISCH                      0x0100  /* MICB2_DISCH */
 #define WM8994_MICB2_DISCH_MASK                 0x0100  /* MICB2_DISCH */
 #define WM8994_MICB2_DISCH_SHIFT                     8  /* MICB2_DISCH */
@@ -4283,6 +4287,18 @@
 #define WM8994_STL_SEL_WIDTH                         1  /* STL_SEL */
 
 /*
+ * R1797 (0x705) - JACKDET Ctrl
+ */
+#define WM1811_JACKDET_DB                       0x0100  /* JACKDET_DB */
+#define WM1811_JACKDET_DB_MASK                  0x0100  /* JACKDET_DB */
+#define WM1811_JACKDET_DB_SHIFT                      8  /* JACKDET_DB */
+#define WM1811_JACKDET_DB_WIDTH                      1  /* JACKDET_DB */
+#define WM1811_JACKDET_LVL                      0x0040  /* JACKDET_LVL */
+#define WM1811_JACKDET_LVL_MASK                 0x0040  /* JACKDET_LVL */
+#define WM1811_JACKDET_LVL_SHIFT                     6  /* JACKDET_LVL */
+#define WM1811_JACKDET_LVL_WIDTH                     1  /* JACKDET_LVL */
+
+/*
  * R1824 (0x720) - Pull Control (1)
  */
 #define WM8994_DMICDAT2_PU                      0x0800  /* DMICDAT2_PU */
sound/soc/codecs/wm8994.c +245 -19

420 lines not on this page · raw message

sound/soc/codecs/wm8994.h +3 -0
index 0678f4d..c3a4247 100644
@@ -75,6 +75,7 @@ struct wm8994_priv {
 	bool fll_locked_irq;
 
 	int vmid_refcount;
+	int active_refcount;
 
 	int dac_rates[2];
 	int lrclk_shared[2];
@@ -116,10 +117,12 @@ struct wm8994_priv {
 	const char **enh_eq_texts;
 	struct soc_enum enh_eq_enum;
 
+	struct mutex accdet_lock;
 	struct wm8994_micdet micdet[2];
 	bool mic_detecting;
 	bool jack_mic;
 	int btn_mask;
+	bool jackdet;
 
 	wm8958_micdet_cb jack_cb;
 	void *jack_cb_data;
Signature · 1 line
1.7.7.3
author
#3 lore raw

PATCH 4/6 ASoC: Ensure we reconfigure WM8958 microphone detection on rate changes

In reply to Mark Brown

We don't need to rerun DAPM if the clock source is the same but we do need to adjust the microphone detection rate in case we are moving from an audio to a non-audio rate.

---
 sound/soc/codecs/wm8994.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8994.c +2 -4
index 5c042de..72282da 100644
@@ -208,10 +208,8 @@ static int configure_clock(struct snd_soc_codec *codec)
 
 	change = snd_soc_update_bits(codec, WM8994_CLOCKING_1,
 				     WM8994_SYSCLK_SRC, new);
-	if (!change)
-		return 0;
-
-	snd_soc_dapm_sync(&codec->dapm);
+	if (change)
+		snd_soc_dapm_sync(&codec->dapm);
 
 	wm8958_micd_set_rate(codec);
 
Signature · 1 line
1.7.7.3
author
#5 lore raw

PATCH 6/6 ASoC: Convert WM8994 to devm_kzalloc()

In reply to Mark Brown

Still have a manual free in there for some realloc()ed memory as there's no devm version of that.

---
 sound/soc/codecs/wm8994.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
sound/soc/codecs/wm8994.c +4 -7
index aea5100..a4b41ff 100644
@@ -2904,8 +2904,8 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
 		};
 
 		/* We need an array of texts for the enum API */
-		wm8994->drc_texts = kmalloc(sizeof(char *)
-					    * pdata->num_drc_cfgs, GFP_KERNEL);
+		wm8994->drc_texts = devm_kzalloc(wm8994->codec->dev,
+			    sizeof(char *) * pdata->num_drc_cfgs, GFP_KERNEL);
 		if (!wm8994->drc_texts) {
 			dev_err(wm8994->codec->dev,
 				"Failed to allocate %d DRC config texts\n",
@@ -3369,7 +3369,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 
 	codec->control_data = control->regmap;
 
-	wm8994 = kzalloc(sizeof(struct wm8994_priv), GFP_KERNEL);
+	wm8994 = devm_kzalloc(codec->dev, sizeof(struct wm8994_priv),
+			      GFP_KERNEL);
 	if (wm8994 == NULL)
 		return -ENOMEM;
 	snd_soc_codec_set_drvdata(codec, wm8994);
@@ -3763,8 +3764,6 @@ err_irq:
 	wm8994_free_irq(wm8994->wm8994, WM8994_IRQ_FIFOS_ERR, codec);
 	wm8994_free_irq(wm8994->wm8994, WM8994_IRQ_TEMP_SHUT, codec);
 	wm8994_free_irq(wm8994->wm8994, WM8994_IRQ_TEMP_WARN, codec);
-err:
-	kfree(wm8994);
 	return ret;
 }
 
@@ -3816,8 +3815,6 @@ static int  wm8994_codec_remove(struct snd_soc_codec *codec)
 	if (wm8994->enh_eq)
 		release_firmware(wm8994->enh_eq);
 	kfree(wm8994->retune_mobile_texts);
-	kfree(wm8994->drc_texts);
-	kfree(wm8994);
 
 	return 0;
 }
Signature · 1 line
1.7.7.3
author
#4 lore raw

PATCH 5/6 ASoC: Add platform data for WM8958/WM1811 microphone detection rates

In reply to Mark Brown

Allow systems to override the default microphone detection rates using platform data in case the settings are not suitable (eg, due to an unusually noisy jack).

---
 include/linux/mfd/wm8994/pdata.h |   20 ++++++++++++++++++++
 sound/soc/codecs/wm8994.c        |   12 ++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)
include/linux/mfd/wm8994/pdata.h +20 -0
index d46c55a..3fb1f40 100644
@@ -113,6 +113,23 @@ struct wm8958_enh_eq_cfg {
 	u16 regs[WM8958_ENH_EQ_REGS];
 };
 
+/**
+ * Microphone detection rates, used to tune response rates and power
+ * consumption for WM8958/WM1811 microphone detection.
+ *
+ * @sysclk: System clock rate to use this configuration for.
+ * @idle: True if this configuration should use when no accessory is detected,
+ *        false otherwise.
+ * @start: Value for MICD_BIAS_START_TIME register field (not shifted).
+ * @rate: Value for MICD_RATE register field (not shifted).
+ */
+struct wm8958_micd_rate {
+	int sysclk;
+	bool idle;
+	int start;
+	int rate;
+};
+
 struct wm8994_pdata {
 	int gpio_base;
 
@@ -144,6 +161,9 @@ struct wm8994_pdata {
 	int num_enh_eq_cfgs;
 	struct wm8958_enh_eq_cfg *enh_eq_cfgs;
 
+	int num_micd_rates;
+	struct wm8958_micd_rate *micd_rates;
+
         /* LINEOUT can be differential or single ended */
         unsigned int lineout1_diff:1;
         unsigned int lineout2_diff:1;
sound/soc/codecs/wm8994.c +4 -8
index 72282da..aea5100 100644
@@ -60,13 +60,6 @@ static int wm8994_retune_mobile_base[] = {
 
 static void wm8958_default_micdet(u16 status, void *data);
 
-struct wm8958_micd_rate {
-	int sysclk;
-	bool idle;
-	int start;
-	int rate;
-};
-
 static const struct wm8958_micd_rate micdet_rates[] = {
 	{ 32768,       true,  1, 4 },
 	{ 32768,       false, 1, 1 },
@@ -100,7 +93,10 @@ static void wm8958_micd_set_rate(struct snd_soc_codec *codec)
 	else
 		sysclk = wm8994->aifclk[0];
 
-	if (wm8994->jackdet) {
+	if (wm8994->pdata && wm8994->pdata->micd_rates) {
+		rates = wm8994->pdata->micd_rates;
+		num_rates = wm8994->pdata->num_micd_rates;
+	} else if (wm8994->jackdet) {
 		rates = jackdet_rates;
 		num_rates = ARRAY_SIZE(jackdet_rates);
 	} else {
Signature · 1 line
1.7.7.3