Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1296963 > unrolled thread

[PATCH 0/6] ASoC: da7219: AB Silicon related updates and small fixes.

Started byAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
First post2015-12-22 19:30 +0100
Last post2015-12-23 12:40 +0100
Articles 12 — 4 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/6] ASoC: da7219: AB Silicon related updates and small fixes. Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2015-12-22 19:30 +0100
    [PATCH 4/6] ASoC: da7219: Remove internal LDO features of codec Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2015-12-22 19:30 +0100
      Re: [PATCH 4/6] ASoC: da7219: Remove internal LDO features of codec Rob Herring <robh@kernel.org> - 2015-12-22 23:40 +0100
    [PATCH 1/6] ASoC: da7219: Disable regulators on probe() failure Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2015-12-22 19:30 +0100
    [PATCH 5/6] ASoC: da7219: Add support for 1.6V micbias level Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2015-12-22 19:30 +0100
      Re: [PATCH 5/6] ASoC: da7219: Add support for 1.6V micbias level Rob Herring <robh@kernel.org> - 2015-12-22 23:40 +0100
    [PATCH 6/6] ASoC: da7219: Remove support for 32KHz PLL mode Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2015-12-22 19:30 +0100
    [PATCH 2/6] ASoC: da7219: Fix Sidetone to work regardless of DAI  capture Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2015-12-22 19:30 +0100
    [PATCH 3/6] ASoC: da7219: Update REFERENCES reg default, in-line with  HW Adam Thomson <Adam.Thomson.Opensource@diasemi.com> - 2015-12-22 19:40 +0100
      Re: [PATCH 3/6] ASoC: da7219: Update REFERENCES reg default, in-line  with HW Mark Brown <broonie@kernel.org> - 2015-12-23 01:20 +0100
        RE: [PATCH 3/6] ASoC: da7219: Update REFERENCES reg default,  in-line with HW "Opensource [Adam Thomson]" <Adam.Thomson.Opensource@diasemi.com> - 2015-12-23 10:50 +0100
          Re: [PATCH 3/6] ASoC: da7219: Update REFERENCES reg default, in-line  with HW Mark Brown <broonie@kernel.org> - 2015-12-23 12:40 +0100

#1296963 — [PATCH 0/6] ASoC: da7219: AB Silicon related updates and small fixes.

FromAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Date2015-12-22 19:30 +0100
Subject[PATCH 0/6] ASoC: da7219: AB Silicon related updates and small fixes.
Message-ID<qIzR7-7qu-3@gated-at.bofh.it>
This is a small collection of updates & fixes, put together for ease.

For changes relating to AB silicon, previous silicon revision is obsolete and
was unavailable outside of Dialog, so does not require driver support in the
future.

Changes are based on v4.4-rc6 kernel.

Adam Thomson (6):
  ASoC: da7219: Disable regulators on probe() failure
  ASoC: da7219: Fix Sidetone to work regardless of DAI capture
  ASoC: da7219: Update REFERENCES reg default, in-line with HW
  ASoC: da7219: Remove internal LDO features of codec
  ASoC: da7219: Add support for 1.6V micbias level
  ASoC: da7219: Remove support for 32KHz PLL mode

 Documentation/devicetree/bindings/sound/da7219.txt |  8 +-
 include/sound/da7219.h                             | 14 +---
 sound/soc/codecs/da7219.c                          | 87 +++++++---------------
 sound/soc/codecs/da7219.h                          |  9 ---
 4 files changed, 32 insertions(+), 86 deletions(-)

--
1.9.3

--
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/

[toc] | [next] | [standalone]

#1296964 — [PATCH 4/6] ASoC: da7219: Remove internal LDO features of codec

FromAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Date2015-12-22 19:30 +0100
Subject[PATCH 4/6] ASoC: da7219: Remove internal LDO features of codec
Message-ID<qIzR7-7qu-5@gated-at.bofh.it>
In reply to#1296963
In AB silicon, the internal LDO is not supported so remove
DT and driver references to this (digital voltage direct from
'VDD' supply)

Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
 Documentation/devicetree/bindings/sound/da7219.txt |  6 ++-
 include/sound/da7219.h                             | 11 -----
 sound/soc/codecs/da7219.c                          | 50 +---------------------
 sound/soc/codecs/da7219.h                          |  7 ---
 4 files changed, 6 insertions(+), 68 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/da7219.txt b/Documentation/devicetree/bindings/sound/da7219.txt
index 1b70309..062a2a0 100644
--- a/Documentation/devicetree/bindings/sound/da7219.txt
+++ b/Documentation/devicetree/bindings/sound/da7219.txt
@@ -28,13 +28,15 @@ Optional properties:
 - clocks : phandle and clock specifier for codec MCLK.
 - clock-names : Clock name string for 'clocks' attribute, should be "mclk".
 
-- dlg,ldo-lvl : Required internal LDO voltage (mV) level for digital engine
-	[<1050>, <1100>, <1200>, <1400>]
 - dlg,micbias-lvl : Voltage (mV) for Mic Bias
 	[<1800>, <2000>, <2200>, <2400>, <2600>]
 - dlg,mic-amp-in-sel : Mic input source type
 	["diff", "se_p", "se_n"]
 
+Deprecated properties:
+- dlg,ldo-lvl : Required internal LDO voltage (mV) level for digital engine
+  (LDO unavailable in production HW so property no longer required).
+
 ======
 
 Child node - 'da7219_aad':
diff --git a/include/sound/da7219.h b/include/sound/da7219.h
index 3f39e13..307198b 100644
--- a/include/sound/da7219.h
+++ b/include/sound/da7219.h
@@ -14,14 +14,6 @@
 #ifndef __DA7219_PDATA_H
 #define __DA7219_PDATA_H
 
-/* LDO */
-enum da7219_ldo_lvl_sel {
-	DA7219_LDO_LVL_SEL_1_05V = 0,
-	DA7219_LDO_LVL_SEL_1_10V,
-	DA7219_LDO_LVL_SEL_1_20V,
-	DA7219_LDO_LVL_SEL_1_40V,
-};
-
 /* Mic Bias */
 enum da7219_micbias_voltage {
 	DA7219_MICBIAS_1_8V = 1,
@@ -41,9 +33,6 @@ enum da7219_mic_amp_in_sel {
 struct da7219_aad_pdata;
 
 struct da7219_pdata {
-	/* Internal LDO */
-	enum da7219_ldo_lvl_sel ldo_lvl_sel;
-
 	/* Mic */
 	enum da7219_micbias_voltage micbias_lvl;
 	enum da7219_mic_amp_in_sel mic_amp_in_sel;
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index 3502c13..5daeec8 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -1406,24 +1406,6 @@ static const struct of_device_id da7219_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, da7219_of_match);
 
-static enum da7219_ldo_lvl_sel da7219_of_ldo_lvl(struct snd_soc_codec *codec,
-						 u32 val)
-{
-	switch (val) {
-	case 1050:
-		return DA7219_LDO_LVL_SEL_1_05V;
-	case 1100:
-		return DA7219_LDO_LVL_SEL_1_10V;
-	case 1200:
-		return DA7219_LDO_LVL_SEL_1_20V;
-	case 1400:
-		return DA7219_LDO_LVL_SEL_1_40V;
-	default:
-		dev_warn(codec->dev, "Invalid LDO level");
-		return DA7219_LDO_LVL_SEL_1_05V;
-	}
-}
-
 static enum da7219_micbias_voltage
 	da7219_of_micbias_lvl(struct snd_soc_codec *codec, u32 val)
 {
@@ -1470,9 +1452,6 @@ static struct da7219_pdata *da7219_of_to_pdata(struct snd_soc_codec *codec)
 	if (!pdata)
 		return NULL;
 
-	if (of_property_read_u32(np, "dlg,ldo-lvl", &of_val32) >= 0)
-		pdata->ldo_lvl_sel = da7219_of_ldo_lvl(codec, of_val32);
-
 	if (of_property_read_u32(np, "dlg,micbias-lvl", &of_val32) >= 0)
 		pdata->micbias_lvl = da7219_of_micbias_lvl(codec, of_val32);
 	else
@@ -1517,24 +1496,13 @@ static int da7219_set_bias_level(struct snd_soc_codec *codec,
 			snd_soc_update_bits(codec, DA7219_REFERENCES,
 					    DA7219_BIAS_EN_MASK,
 					    DA7219_BIAS_EN_MASK);
-
-			/* Enable Internal Digital LDO */
-			snd_soc_update_bits(codec, DA7219_LDO_CTRL,
-					    DA7219_LDO_EN_MASK,
-					    DA7219_LDO_EN_MASK);
 		}
 		break;
 	case SND_SOC_BIAS_OFF:
-		/* Only disable if jack detection not active */
-		if (!da7219->aad->jack) {
-			/* Bypass Internal Digital LDO */
-			snd_soc_update_bits(codec, DA7219_LDO_CTRL,
-					    DA7219_LDO_EN_MASK, 0);
-
-			/* Master bias */
+		/* Only disable master bias if jack detection not active */
+		if (!da7219->aad->jack)
 			snd_soc_update_bits(codec, DA7219_REFERENCES,
 					    DA7219_BIAS_EN_MASK, 0);
-		}
 
 		/* MCLK */
 		if (da7219->mclk)
@@ -1601,19 +1569,6 @@ static void da7219_handle_pdata(struct snd_soc_codec *codec)
 	if (pdata) {
 		u8 micbias_lvl = 0;
 
-		/* Internal LDO */
-		switch (pdata->ldo_lvl_sel) {
-		case DA7219_LDO_LVL_SEL_1_05V:
-		case DA7219_LDO_LVL_SEL_1_10V:
-		case DA7219_LDO_LVL_SEL_1_20V:
-		case DA7219_LDO_LVL_SEL_1_40V:
-			snd_soc_update_bits(codec, DA7219_LDO_CTRL,
-					    DA7219_LDO_LEVEL_SELECT_MASK,
-					    (pdata->ldo_lvl_sel <<
-					     DA7219_LDO_LEVEL_SELECT_SHIFT));
-			break;
-		}
-
 		/* Mic Bias voltages */
 		switch (pdata->micbias_lvl) {
 		case DA7219_MICBIAS_1_8V:
@@ -1823,7 +1778,6 @@ static struct reg_default da7219_reg_defaults[] = {
 	{ DA7219_CHIP_ID1, 0x23 },
 	{ DA7219_CHIP_ID2, 0x93 },
 	{ DA7219_CHIP_REVISION, 0x00 },
-	{ DA7219_LDO_CTRL, 0x00 },
 	{ DA7219_IO_CTRL, 0x00 },
 	{ DA7219_GAIN_RAMP_CTRL, 0x00 },
 	{ DA7219_PC_COUNT, 0x02 },
diff --git a/sound/soc/codecs/da7219.h b/sound/soc/codecs/da7219.h
index b514268..2b3f447 100644
--- a/sound/soc/codecs/da7219.h
+++ b/sound/soc/codecs/da7219.h
@@ -85,7 +85,6 @@
 #define DA7219_CHIP_ID1			0x81
 #define DA7219_CHIP_ID2			0x82
 #define DA7219_CHIP_REVISION		0x83
-#define DA7219_LDO_CTRL			0x90
 #define DA7219_IO_CTRL			0x91
 #define DA7219_GAIN_RAMP_CTRL		0x92
 #define DA7219_PC_COUNT			0x94
@@ -569,12 +568,6 @@
 #define DA7219_CHIP_MAJOR_SHIFT	4
 #define DA7219_CHIP_MAJOR_MASK	(0xF << 4)
 
-/* DA7219_LDO_CTRL = 0x90 */
-#define DA7219_LDO_LEVEL_SELECT_SHIFT	4
-#define DA7219_LDO_LEVEL_SELECT_MASK	(0x3 << 4)
-#define DA7219_LDO_EN_SHIFT		7
-#define DA7219_LDO_EN_MASK		(0x1 << 7)
-
 /* DA7219_IO_CTRL = 0x91 */
 #define DA7219_IO_VOLTAGE_LEVEL_SHIFT		0
 #define DA7219_IO_VOLTAGE_LEVEL_MASK		(0x1 << 0)
-- 
1.9.3

--
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/

[toc] | [prev] | [next] | [standalone]

#1297125 — Re: [PATCH 4/6] ASoC: da7219: Remove internal LDO features of codec

FromRob Herring <robh@kernel.org>
Date2015-12-22 23:40 +0100
SubjectRe: [PATCH 4/6] ASoC: da7219: Remove internal LDO features of codec
Message-ID<qIDL3-1mS-7@gated-at.bofh.it>
In reply to#1296964
On Tue, Dec 22, 2015 at 06:27:54PM +0000, Adam Thomson wrote:
> In AB silicon, the internal LDO is not supported so remove
> DT and driver references to this (digital voltage direct from
> 'VDD' supply)
> 
> Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
> ---
>  Documentation/devicetree/bindings/sound/da7219.txt |  6 ++-

Acked-by: Rob Herring <robh@kernel.org>
--
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/

[toc] | [prev] | [next] | [standalone]

#1296965 — [PATCH 1/6] ASoC: da7219: Disable regulators on probe() failure

FromAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Date2015-12-22 19:30 +0100
Subject[PATCH 1/6] ASoC: da7219: Disable regulators on probe() failure
Message-ID<qIzR7-7qu-9@gated-at.bofh.it>
In reply to#1296963
If codec probe() function fails after supplies have been enabled
it should really tidy up and disable them again. This patch updates
the probe function to do just that.

Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
 sound/soc/codecs/da7219.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index f238c1e..0ba714c 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -1662,10 +1662,12 @@ static int da7219_probe(struct snd_soc_codec *codec)
 	/* Check if MCLK provided */
 	da7219->mclk = devm_clk_get(codec->dev, "mclk");
 	if (IS_ERR(da7219->mclk)) {
-		if (PTR_ERR(da7219->mclk) != -ENOENT)
-			return PTR_ERR(da7219->mclk);
-		else
+		if (PTR_ERR(da7219->mclk) != -ENOENT) {
+			ret = PTR_ERR(da7219->mclk);
+			goto err_disable_reg;
+		} else {
 			da7219->mclk = NULL;
+		}
 	}
 
 	/* Default PC counter to free-running */
@@ -1693,7 +1695,16 @@ static int da7219_probe(struct snd_soc_codec *codec)
 	snd_soc_write(codec, DA7219_TONE_GEN_CYCLES, DA7219_BEEP_CYCLES_MASK);
 
 	/* Initialise AAD block */
-	return da7219_aad_init(codec);
+	ret = da7219_aad_init(codec);
+	if (ret)
+		goto err_disable_reg;
+
+	return 0;
+
+err_disable_reg:
+	regulator_bulk_disable(DA7219_NUM_SUPPLIES, da7219->supplies);
+
+	return ret;
 }
 
 static int da7219_remove(struct snd_soc_codec *codec)
-- 
1.9.3

--
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/

[toc] | [prev] | [next] | [standalone]

#1296968 — [PATCH 5/6] ASoC: da7219: Add support for 1.6V micbias level

FromAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Date2015-12-22 19:30 +0100
Subject[PATCH 5/6] ASoC: da7219: Add support for 1.6V micbias level
Message-ID<qIzR8-7qu-17@gated-at.bofh.it>
In reply to#1296963
HW can provide 1.6V micbias level as well the existing levels
already provided in the driver. This patch adds support for 1.6V
to the DT binding.

Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
 Documentation/devicetree/bindings/sound/da7219.txt | 2 +-
 include/sound/da7219.h                             | 3 ++-
 sound/soc/codecs/da7219.c                          | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/da7219.txt b/Documentation/devicetree/bindings/sound/da7219.txt
index 062a2a0..cf61681 100644
--- a/Documentation/devicetree/bindings/sound/da7219.txt
+++ b/Documentation/devicetree/bindings/sound/da7219.txt
@@ -29,7 +29,7 @@ Optional properties:
 - clock-names : Clock name string for 'clocks' attribute, should be "mclk".
 
 - dlg,micbias-lvl : Voltage (mV) for Mic Bias
-	[<1800>, <2000>, <2200>, <2400>, <2600>]
+	[<1600>, <1800>, <2000>, <2200>, <2400>, <2600>]
 - dlg,mic-amp-in-sel : Mic input source type
 	["diff", "se_p", "se_n"]
 
diff --git a/include/sound/da7219.h b/include/sound/da7219.h
index 307198b..02876ac 100644
--- a/include/sound/da7219.h
+++ b/include/sound/da7219.h
@@ -16,7 +16,8 @@
 
 /* Mic Bias */
 enum da7219_micbias_voltage {
-	DA7219_MICBIAS_1_8V = 1,
+	DA7219_MICBIAS_1_6V = 0,
+	DA7219_MICBIAS_1_8V,
 	DA7219_MICBIAS_2_0V,
 	DA7219_MICBIAS_2_2V,
 	DA7219_MICBIAS_2_4V,
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index 5daeec8..c019fef 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -1410,6 +1410,8 @@ static enum da7219_micbias_voltage
 	da7219_of_micbias_lvl(struct snd_soc_codec *codec, u32 val)
 {
 	switch (val) {
+	case 1600:
+		return DA7219_MICBIAS_1_6V;
 	case 1800:
 		return DA7219_MICBIAS_1_8V;
 	case 2000:
@@ -1571,6 +1573,7 @@ static void da7219_handle_pdata(struct snd_soc_codec *codec)
 
 		/* Mic Bias voltages */
 		switch (pdata->micbias_lvl) {
+		case DA7219_MICBIAS_1_6V:
 		case DA7219_MICBIAS_1_8V:
 		case DA7219_MICBIAS_2_0V:
 		case DA7219_MICBIAS_2_2V:
-- 
1.9.3

--
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/

[toc] | [prev] | [next] | [standalone]

#1297126 — Re: [PATCH 5/6] ASoC: da7219: Add support for 1.6V micbias level

FromRob Herring <robh@kernel.org>
Date2015-12-22 23:40 +0100
SubjectRe: [PATCH 5/6] ASoC: da7219: Add support for 1.6V micbias level
Message-ID<qIDL3-1mS-11@gated-at.bofh.it>
In reply to#1296968
On Tue, Dec 22, 2015 at 06:27:55PM +0000, Adam Thomson wrote:
> HW can provide 1.6V micbias level as well the existing levels
> already provided in the driver. This patch adds support for 1.6V
> to the DT binding.
> 
> Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
> ---
>  Documentation/devicetree/bindings/sound/da7219.txt | 2 +-

Acked-by: Rob Herring <robh@kernel.org>

--
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/

[toc] | [prev] | [next] | [standalone]

#1296970 — [PATCH 6/6] ASoC: da7219: Remove support for 32KHz PLL mode

FromAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Date2015-12-22 19:30 +0100
Subject[PATCH 6/6] ASoC: da7219: Remove support for 32KHz PLL mode
Message-ID<qIzR8-7qu-25@gated-at.bofh.it>
In reply to#1296963
PLL mode based on 32KHz master clock not supported in
AB silicon so remove support from the driver.

Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
 sound/soc/codecs/da7219.c | 10 ++--------
 sound/soc/codecs/da7219.h |  2 --
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index c019fef..82a7236 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -1074,11 +1074,8 @@ static int da7219_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
 	u32 freq_ref;
 	u64 frac_div;
 
-	/* Verify 32KHz, 2MHz - 54MHz MCLK provided, and set input divider */
-	if (da7219->mclk_rate == 32768) {
-		indiv_bits = DA7219_PLL_INDIV_2_5_MHZ;
-		indiv = DA7219_PLL_INDIV_2_5_MHZ_VAL;
-	} else if (da7219->mclk_rate < 2000000) {
+	/* Verify 2MHz - 54MHz MCLK provided, and set input divider */
+	if (da7219->mclk_rate < 2000000) {
 		dev_err(codec->dev, "PLL input clock %d below valid range\n",
 			da7219->mclk_rate);
 		return -EINVAL;
@@ -1119,9 +1116,6 @@ static int da7219_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
 	case DA7219_SYSCLK_PLL_SRM:
 		pll_ctrl |= DA7219_PLL_MODE_SRM;
 		break;
-	case DA7219_SYSCLK_PLL_32KHZ:
-		pll_ctrl |= DA7219_PLL_MODE_32KHZ;
-		break;
 	default:
 		dev_err(codec->dev, "Invalid PLL config\n");
 		return -EINVAL;
diff --git a/sound/soc/codecs/da7219.h b/sound/soc/codecs/da7219.h
index 2b3f447..5a787e7 100644
--- a/sound/soc/codecs/da7219.h
+++ b/sound/soc/codecs/da7219.h
@@ -206,7 +206,6 @@
 #define DA7219_PLL_MODE_BYPASS		(0x0 << 6)
 #define DA7219_PLL_MODE_NORMAL		(0x1 << 6)
 #define DA7219_PLL_MODE_SRM		(0x2 << 6)
-#define DA7219_PLL_MODE_32KHZ		(0x3 << 6)
 
 /* DA7219_PLL_FRAC_TOP = 0x22 */
 #define DA7219_PLL_FBDIV_FRAC_TOP_SHIFT	0
@@ -780,7 +779,6 @@ enum da7219_sys_clk {
 	DA7219_SYSCLK_MCLK = 0,
 	DA7219_SYSCLK_PLL,
 	DA7219_SYSCLK_PLL_SRM,
-	DA7219_SYSCLK_PLL_32KHZ
 };
 
 /* Regulators */
-- 
1.9.3

--
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/

[toc] | [prev] | [next] | [standalone]

#1296971 — [PATCH 2/6] ASoC: da7219: Fix Sidetone to work regardless of DAI capture

FromAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Date2015-12-22 19:30 +0100
Subject[PATCH 2/6] ASoC: da7219: Fix Sidetone to work regardless of DAI capture
Message-ID<qIzR8-7qu-23@gated-at.bofh.it>
In reply to#1296963
Previously Sidetone would operate only when capture to DAI was in
progress, due to DAPM path configuration. There is no reason why
this should not operate without DAI capture, so this patch updates
the DAPM path accordingly.

Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
 sound/soc/codecs/da7219.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index 0ba714c..253d8e7 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -968,10 +968,11 @@ static const struct snd_soc_dapm_route da7219_audio_map[] = {
 	{"Mixin PGA", NULL, "Mic PGA"},
 	{"ADC", NULL, "Mixin PGA"},
 
-	{"Sidetone Filter", NULL, "ADC"},
 	{"Mixer In", NULL, "Mixer In Supply"},
 	{"Mixer In", "Mic Switch", "ADC"},
 
+	{"Sidetone Filter", NULL, "Mixer In"},
+
 	{"Tone Generator", NULL, "TONE"},
 
 	DA7219_OUT_DAI_MUX_ROUTES("Out DAIL Mux"),
-- 
1.9.3

--
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/

[toc] | [prev] | [next] | [standalone]

#1296976 — [PATCH 3/6] ASoC: da7219: Update REFERENCES reg default, in-line with HW

FromAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Date2015-12-22 19:40 +0100
Subject[PATCH 3/6] ASoC: da7219: Update REFERENCES reg default, in-line with HW
Message-ID<qIA0O-7v6-11@gated-at.bofh.it>
In reply to#1296963
In current AB silicon, BIAS_EN field is enabled by default in the
REFERENCES register, so the regmap default value should reflect
this.

Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
 sound/soc/codecs/da7219.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index 253d8e7..3502c13 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -1788,7 +1788,7 @@ static struct reg_default da7219_reg_defaults[] = {
 	{ DA7219_DIG_ROUTING_DAC, 0x32 },
 	{ DA7219_DAI_OFFSET_LOWER, 0x00 },
 	{ DA7219_DAI_OFFSET_UPPER, 0x00 },
-	{ DA7219_REFERENCES, 0x00 },
+	{ DA7219_REFERENCES, 0x08 },
 	{ DA7219_MIXIN_L_SELECT, 0x00 },
 	{ DA7219_MIXIN_L_GAIN, 0x03 },
 	{ DA7219_ADC_L_GAIN, 0x6F },
-- 
1.9.3

--
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/

[toc] | [prev] | [next] | [standalone]

#1297162 — Re: [PATCH 3/6] ASoC: da7219: Update REFERENCES reg default, in-line with HW

FromMark Brown <broonie@kernel.org>
Date2015-12-23 01:20 +0100
SubjectRe: [PATCH 3/6] ASoC: da7219: Update REFERENCES reg default, in-line with HW
Message-ID<qIFjQ-2w8-11@gated-at.bofh.it>
In reply to#1296976

[Multipart message — attachments visible in raw view] — view raw

On Tue, Dec 22, 2015 at 06:27:53PM +0000, Adam Thomson wrote:
> In current AB silicon, BIAS_EN field is enabled by default in the
> REFERENCES register, so the regmap default value should reflect
> this.

This is the sort of thing where a register patch would normally be used
- if you put in a register patch for the older silicon then the driver
can correct for the register default automatically.

[toc] | [prev] | [next] | [standalone]

#1297301 — RE: [PATCH 3/6] ASoC: da7219: Update REFERENCES reg default, in-line with HW

From"Opensource [Adam Thomson]" <Adam.Thomson.Opensource@diasemi.com>
Date2015-12-23 10:50 +0100
SubjectRE: [PATCH 3/6] ASoC: da7219: Update REFERENCES reg default, in-line with HW
Message-ID<qIOdr-7UY-1@gated-at.bofh.it>
In reply to#1297162
T24gRGVjZW1iZXIgMjMsIDIwMTUgMDA6MTAsIE1hcmsgQnJvd24gd3JvdGU6DQoNCj4gT24gVHVl
LCBEZWMgMjIsIDIwMTUgYXQgMDY6Mjc6NTNQTSArMDAwMCwgQWRhbSBUaG9tc29uIHdyb3RlOg0K
PiA+IEluIGN1cnJlbnQgQUIgc2lsaWNvbiwgQklBU19FTiBmaWVsZCBpcyBlbmFibGVkIGJ5IGRl
ZmF1bHQgaW4gdGhlDQo+ID4gUkVGRVJFTkNFUyByZWdpc3Rlciwgc28gdGhlIHJlZ21hcCBkZWZh
dWx0IHZhbHVlIHNob3VsZCByZWZsZWN0DQo+ID4gdGhpcy4NCj4gDQo+IFRoaXMgaXMgdGhlIHNv
cnQgb2YgdGhpbmcgd2hlcmUgYSByZWdpc3RlciBwYXRjaCB3b3VsZCBub3JtYWxseSBiZSB1c2Vk
DQo+IC0gaWYgeW91IHB1dCBpbiBhIHJlZ2lzdGVyIHBhdGNoIGZvciB0aGUgb2xkZXIgc2lsaWNv
biB0aGVuIHRoZSBkcml2ZXINCj4gY2FuIGNvcnJlY3QgZm9yIHRoZSByZWdpc3RlciBkZWZhdWx0
IGF1dG9tYXRpY2FsbHkuDQoNClRoYW5rcy4gWWVzLCBhbSBhd2FyZSBvZiB0aGF0LiBXZXJlIHRo
ZSBvbGRlciBzaWxpY29uIHN0aWxsIGluIHVzZSB0aGVuIEknZCBoYXZlDQp0YWtlbiB0aGF0IHJv
dXRlLCBidXQgZGlkbid0IHNlZW0gbmVjZXNzYXJ5IGluIHRoaXMgaW5zdGFuY2UuDQo=
--
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/

[toc] | [prev] | [next] | [standalone]

#1297388 — Re: [PATCH 3/6] ASoC: da7219: Update REFERENCES reg default, in-line with HW

FromMark Brown <broonie@kernel.org>
Date2015-12-23 12:40 +0100
SubjectRe: [PATCH 3/6] ASoC: da7219: Update REFERENCES reg default, in-line with HW
Message-ID<qIPVU-yO-25@gated-at.bofh.it>
In reply to#1297301

[Multipart message — attachments visible in raw view] — view raw

On Wed, Dec 23, 2015 at 09:47:23AM +0000, Opensource [Adam Thomson] wrote:
> On December 23, 2015 00:10, Mark Brown wrote:

> > This is the sort of thing where a register patch would normally be used
> > - if you put in a register patch for the older silicon then the driver
> > can correct for the register default automatically.

> Thanks. Yes, am aware of that. Were the older silicon still in use then I'd have
> taken that route, but didn't seem necessary in this instance.

It costs you nothing to do it properly and you might be surprised how
often older silicon turns up somewhere.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web