Skip to contentSkip to conversation

ASoC: codec: tlv3204: Codec workaround

PATCH Superseded Michael Sit Wei Hong 4 participants 11 messages Jul 29, 2020 – Aug 4, 2020

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover ASoC: codec: tlv3204: Codec workaround

This patch series enables some features on the tlv3204 codec and also fixes some issues faced while testing

v1: initial ASoC: codec: tlv3204: Codec workaround series

Michael Sit Wei Hong (3):
ASoC: codec: tlv3204: Enable 24 bit audio support
ASoC: codec: tlv3204: Increased maximum supported channels
ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

 sound/soc/codecs/tlv320aic32x4.c | 60 +++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 16 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/3 ASoC: codec: tlv3204: Enable 24 bit audio support

Enable 24 bit in 32 bit container audio support.
Using the params_physical_width to differentiate
24 bit in 32 bit container and 24 bit in 24 bit container modes. Use the sample rate, bit depth and channel parameters to calculate the bit clock needed.

---
 sound/soc/codecs/tlv320aic32x4.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
sound/soc/codecs/tlv320aic32x4.c +10 -5
index d087f3b20b1d..8534f9006e6a 100644
@@ -665,7 +665,8 @@ static int aic32x4_set_processing_blocks(struct snd_soc_component *component,
 }
 
 static int aic32x4_setup_clocks(struct snd_soc_component *component,
-				unsigned int sample_rate)
+			unsigned int sample_rate, unsigned int channel,
+			unsigned int bit_depth)
 {
 	u8 aosr;
 	u16 dosr;
@@ -753,7 +754,8 @@ static int aic32x4_setup_clocks(struct snd_soc_component *component,
 							dosr);
 
 						clk_set_rate(clocks[5].clk,
-							sample_rate * 32);
+							sample_rate * channel *
+							bit_depth);
 						return 0;
 					}
 				}
@@ -775,9 +777,11 @@ static int aic32x4_hw_params(struct snd_pcm_substream *substream,
 	u8 iface1_reg = 0;
 	u8 dacsetup_reg = 0;
 
-	aic32x4_setup_clocks(component, params_rate(params));
+	aic32x4_setup_clocks(component, params_rate(params),
+			     params_channels(params),
+			     params_physical_width(params));
 
-	switch (params_width(params)) {
+	switch (params_physical_width(params)) {
 	case 16:
 		iface1_reg |= (AIC32X4_WORD_LEN_16BITS <<
 				   AIC32X4_IFACE1_DATALEN_SHIFT);
@@ -862,7 +866,8 @@ static int aic32x4_set_bias_level(struct snd_soc_component *component,
 
 #define AIC32X4_RATES	SNDRV_PCM_RATE_8000_192000
 #define AIC32X4_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE \
-			 | SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)
+			 | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S24_3LE \
+			 | SNDRV_PCM_FMTBIT_S32_LE)
 
 static const struct snd_soc_dai_ops aic32x4_ops = {
 	.hw_params = aic32x4_hw_params,
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/3 ASoC: codec: tlv3204: Increased maximum supported channels

In reply to Michael Sit Wei Hong

Increased maximum supported channel to 8 channels for audio capture running in TDM mode.

---
 sound/soc/codecs/tlv320aic32x4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/tlv320aic32x4.c +1 -1
index 8534f9006e6a..5af438a00f95 100644
@@ -887,7 +887,7 @@ static struct snd_soc_dai_driver aic32x4_dai = {
 	.capture = {
 			.stream_name = "Capture",
 			.channels_min = 1,
-			.channels_max = 2,
+			.channels_max = 8,
 			.rates = AIC32X4_RATES,
 			.formats = AIC32X4_FORMATS,},
 	.ops = &aic32x4_ops,
Signature · 1 line
2.17.1
#3 lore raw

PATCH 3/3 ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

In reply to Michael Sit Wei Hong

Moving GPIO reset to a later stage and before clock registration to ensure that the host system and codec clocks are in sync. If the host register clock values prior to gpio reset, the last configured codec clock is registered to the host. The codec then gets gpio resetted setting the codec clocks to their default value, causing a mismatch. Host system will skip clock setting thinking the codec clocks are already at the requested rate.

ADC reset is added to ensure the next audio capture does not have undesired artifacts. It is probably related to the original code where the probe function resets the ADC prior to 1st record.

---
 sound/soc/codecs/tlv320aic32x4.c | 47 ++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 12 deletions(-)
sound/soc/codecs/tlv320aic32x4.c +35 -12
index 5af438a00f95..37e14558d7c0 100644
@@ -50,6 +50,28 @@ struct aic32x4_priv {
 	struct device *dev;
 };
 
+static int aic32x4_reset_adc(struct snd_soc_dapm_widget *w,
+			     struct snd_kcontrol *kcontrol, int event)
+{
+	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
+	u32 adc_reg;
+
+	/*
+	 * Workaround: the datasheet does not mention a required programming
+	 * sequence but experiments show the ADC needs to be reset after each
+	 * capture to avoid audible artifacts.
+	 */
+	switch (event) {
+	case SND_SOC_DAPM_POST_PMD:
+		adc_reg = snd_soc_component_read32(component, AIC32X4_ADCSETUP);
+		snd_soc_component_write(component, AIC32X4_ADCSETUP, adc_reg |
+					AIC32X4_LADC_EN | AIC32X4_RADC_EN);
+		snd_soc_component_write(component, AIC32X4_ADCSETUP, adc_reg);
+		break;
+	}
+	return 0;
+};
+
 static int mic_bias_event(struct snd_soc_dapm_widget *w,
 	struct snd_kcontrol *kcontrol, int event)
 {
@@ -434,6 +456,7 @@ static const struct snd_soc_dapm_widget aic32x4_dapm_widgets[] = {
 	SND_SOC_DAPM_SUPPLY("Mic Bias", AIC32X4_MICBIAS, 6, 0, mic_bias_event,
 			SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
 
+	SND_SOC_DAPM_POST("ADC Reset", aic32x4_reset_adc),
 
 	SND_SOC_DAPM_OUTPUT("HPL"),
 	SND_SOC_DAPM_OUTPUT("HPR"),
@@ -665,8 +688,8 @@ static int aic32x4_set_processing_blocks(struct snd_soc_component *component,
 }
 
 static int aic32x4_setup_clocks(struct snd_soc_component *component,
-			unsigned int sample_rate, unsigned int channel,
-			unsigned int bit_depth)
+				unsigned int sample_rate, unsigned int channel,
+				unsigned int bit_depth)
 {
 	u8 aosr;
 	u16 dosr;
@@ -957,12 +980,6 @@ static int aic32x4_component_probe(struct snd_soc_component *component)
 	if (ret)
 		return ret;
 
-	if (gpio_is_valid(aic32x4->rstn_gpio)) {
-		ndelay(10);
-		gpio_set_value(aic32x4->rstn_gpio, 1);
-		mdelay(1);
-	}
-
 	snd_soc_component_write(component, AIC32X4_RESET, 0x01);
 
 	if (aic32x4->setup)
@@ -1195,10 +1212,6 @@ int aic32x4_probe(struct device *dev, struct regmap *regmap)
 		aic32x4->mclk_name = "mclk";
 	}
 
-	ret = aic32x4_register_clocks(dev, aic32x4->mclk_name);
-	if (ret)
-		return ret;
-
 	if (gpio_is_valid(aic32x4->rstn_gpio)) {
 		ret = devm_gpio_request_one(dev, aic32x4->rstn_gpio,
 				GPIOF_OUT_INIT_LOW, "tlv320aic32x4 rstn");
@@ -1220,6 +1233,16 @@ int aic32x4_probe(struct device *dev, struct regmap *regmap)
 		return ret;
 	}
 
+	if (gpio_is_valid(aic32x4->rstn_gpio)) {
+		ndelay(10);
+		gpio_set_value_cansleep(aic32x4->rstn_gpio, 1);
+		mdelay(1);
+	}
+
+	ret = aic32x4_register_clocks(dev, aic32x4->mclk_name);
+	if (ret)
+		return ret;
+
 	return 0;
 }
 EXPORT_SYMBOL(aic32x4_probe);
Signature · 1 line
2.17.1
#4 lore raw

Re: [PATCH 3/3] ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

Hello

Quoted 31 lines · Michael Sit Wei Hong

Moving GPIO reset to a later stage and before clock registration to ensure that the host system and codec clocks are in sync. If the host register clock values prior to gpio reset, the last configured codec clock is registered to the host. The codec then gets gpio resetted setting the codec clocks to their default value, causing a mismatch. Host system will skip clock setting thinking the codec clocks are already at the requested rate.

ADC reset is added to ensure the next audio capture does not have undesired artifacts. It is probably related to the original code where the probe function resets the ADC prior to 1st record.

---
  sound/soc/codecs/tlv320aic32x4.c | 47 ++++++++++++++++++++++++--------
  1 file changed, 35 insertions(+), 12 deletions(-)
sound/soc/codecs/tlv320aic32x4.c +4 -0
index 5af438a00f95..37e14558d7c0 100644
@@ -50,6 +50,28 @@ struct aic32x4_priv {
  	struct device *dev;
  };
 
+static int aic32x4_reset_adc(struct snd_soc_dapm_widget *w,
+			     struct snd_kcontrol *kcontrol, int event)
+{
+	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

sound/soc/codecs/tlv320aic32x4.c struct aic32x4_priv { · line 66

Quoted 10 lines
sound/soc/codecs/tlv320aic32x4.c +10 -0
+	u32 adc_reg;
+
+	/*
+	 * Workaround: the datasheet does not mention a required programming
+	 * sequence but experiments show the ADC needs to be reset after each
+	 * capture to avoid audible artifacts.
+	 */
+	switch (event) {
+	case SND_SOC_DAPM_POST_PMD:
+		adc_reg = snd_soc_component_read32(component, AIC32X4_ADCSETUP);

This gives me a build error

sound/soc/codecs/tlv320aic32x4.c: In function ‘aic32x4_reset_adc’:
sound/soc/codecs/tlv320aic32x4.c:66:13: error: implicit declaration of function ‘snd_soc_component_read32’; did you mean ‘snd_soc_component_read’? [-Werror=implicit-function-declaration] 66 |   adc_reg = snd_soc_component_read32(component, AIC32X4_ADCSETUP);
      |             ^~~~~~~~~~~~~~~~~~~~~~~~
      |             snd_soc_component_read

Also you should check the return to make sure it is valid.

Dan

#5 lore raw

RE: [PATCH 3/3] ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

Hi Dan,

The code snippet is taken from the aic32x4_component_probe function of the driver in 5.8.

Could you have a look at that portion and see if it is the same?

Thanks,
Regards,
Michael

-----Original Message-----
From: Dan Murphy <[email protected]>
Sent: Wednesday, 29 July, 2020 8:31 PM
To: Sit, Michael Wei Hong <[email protected]>; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Rojewski, Cezary <[email protected]>; Shevchenko, Andriy <[email protected]>; [email protected]; Sia, Jee Heng <[email protected]>; [email protected]; [email protected]
Subject: Re: [PATCH 3/3] ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

Hello

Quoted 32 lines · Michael Sit Wei Hong

Moving GPIO reset to a later stage and before clock registration to ensure that the host system and codec clocks are in sync. If the host register clock values prior to gpio reset, the last configured codec clock is registered to the host. The codec then gets gpio resetted setting the codec clocks to their default value, causing a mismatch. Host system will skip clock setting thinking the codec clocks are already at the requested rate.

ADC reset is added to ensure the next audio capture does not have undesired artifacts. It is probably related to the original code where the probe function resets the ADC prior to 1st record.

Reviewed-by Pierre-Louis Bossart

<[email protected]>

---
  sound/soc/codecs/tlv320aic32x4.c | 47 ++++++++++++++++++++++++--------
  1 file changed, 35 insertions(+), 12 deletions(-)
sound/soc/codecs/tlv320aic32x4.c +3 -0
index 5af438a00f95..37e14558d7c0 100644
@@ -50,6 +50,28 @@ struct aic32x4_priv {
  	struct device *dev;
  };
 
+static int aic32x4_reset_adc(struct snd_soc_dapm_widget *w,
+			     struct snd_kcontrol *kcontrol, int event) {
+	struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

sound/soc/codecs/tlv320aic32x4.c struct aic32x4_priv { · line 65

Quoted 10 lines
sound/soc/codecs/tlv320aic32x4.c +10 -0
+	u32 adc_reg;
+
+	/*
+	 * Workaround: the datasheet does not mention a required programming
+	 * sequence but experiments show the ADC needs to be reset after each
+	 * capture to avoid audible artifacts.
+	 */
+	switch (event) {
+	case SND_SOC_DAPM_POST_PMD:
+		adc_reg = snd_soc_component_read32(component, AIC32X4_ADCSETUP);

This gives me a build error

sound/soc/codecs/tlv320aic32x4.c: In function ‘aic32x4_reset_adc’:
sound/soc/codecs/tlv320aic32x4.c:66:13: error: implicit declaration of function ‘snd_soc_component_read32’; did you mean ‘snd_soc_component_read’? [-Werror=implicit-function-declaration]
   66 |   adc_reg = snd_soc_component_read32(component, AIC32X4_ADCSETUP);
      |             ^~~~~~~~~~~~~~~~~~~~~~~~
      |             snd_soc_component_read

Also you should check the return to make sure it is valid.

Dan

maintainer
#6 lore raw

Re: [PATCH 3/3] ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

Quoted 5 lines · Michael Wei Hong

Hi Dan,

The code snippet is taken from the aic32x4_component_probe function of the driver in 5.8.

Could you have a look at that portion and see if it is the same?

You need to submit code against the current development branch unless it's a bug fix for the current release branch, sometimes interfaces change in the development version (as is the case here).

Please don't top post, reply in line with needed context. This allows readers to readily follow the flow of conversation and understand what you are talking about and also helps ensure that everything in the discussion is being addressed.

Please fix your mail client to word wrap within paragraphs at something substantially less than 80 columns. Doing this makes your messages much easier to read and reply to.

#7 lore raw

RE: [PATCH 3/3] ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

Quoted 130 lines

-----Original Message-----
From: Mark Brown <[email protected]>
Sent: Thursday, 30 July, 2020 8:34 PM
To: Sit, Michael Wei Hong <[email protected]>
Cc: Dan Murphy <[email protected]>; [email protected]; [email protected]; [email protected]; Rojewski, Cezary <[email protected]>; Shevchenko, Andriy <[email protected]>; [email protected]; Sia, Jee Heng <[email protected]>; [email protected]; [email protected]
Subject: Re: [PATCH 3/3] ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

Quoted 3 lines · Michael Wei Hong

Hi Dan,

The code snippet is taken from the aic32x4_component_probe function

of the driver in 5.8.

Quoted 2 lines

Could you have a look at that portion and see if it is the same?

You need to submit code against the current development branch unless it's a bug fix for the current release branch, sometimes interfaces change in the development version (as is the case here).

Please don't top post, reply in line with needed context. This allows readers to readily follow the flow of conversation and understand what you are talking about and also helps ensure that everything in the discussion is being addressed.

Please fix your mail client to word wrap within paragraphs at something substantially less than 80 columns. Doing this makes your messages much easier to read and reply to.

-----Original Message-----
From: Alsa-devel <[email protected]> On Behalf Of Sit, Michael Wei Hong
Sent: Thursday, 30 July, 2020 1:46 PM
To: Dan Murphy <[email protected]>; [email protected]
Cc: Rojewski, Cezary <[email protected]>; [email protected]; Shevchenko, Andriy <[email protected]>; [email protected]; Sia, Jee Heng <[email protected]>; pierre- [email protected]; [email protected]; [email protected]; [email protected]
Subject: RE: [PATCH 3/3] ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

Hi Dan,

The code snippet is taken from the aic32x4_component_probe function of the driver in 5.8.

Could you have a look at that portion and see if it is the same?

Thanks,
Regards,
Michael

-----Original Message-----
From: Dan Murphy <[email protected]>
Sent: Wednesday, 29 July, 2020 8:31 PM
To: Sit, Michael Wei Hong <[email protected]>; alsa- [email protected]
Cc: [email protected]; [email protected]; pierre- [email protected]; Rojewski, Cezary <[email protected]>; Shevchenko, Andriy <[email protected]>; [email protected]; Sia, Jee Heng <[email protected]>; [email protected]; [email protected]
Subject: Re: [PATCH 3/3] ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

Hello

Quoted 12 lines · Michael Sit Wei Hong

Moving GPIO reset to a later stage and before clock registration to ensure that the host system and codec clocks are in sync. If the host register clock values prior to gpio reset, the last configured codec clock is registered to the host. The codec then gets gpio resetted setting the codec clocks to their default value, causing a mismatch. Host system will skip clock setting thinking the codec clocks are already at the requested rate.

ADC reset is added to ensure the next audio capture does not have undesired artifacts. It is probably related to the original code where the probe function resets the ADC prior to 1st record.

Quoted 6 lines
Reviewed-by Pierre-Louis Bossart

<[email protected]>

---
  sound/soc/codecs/tlv320aic32x4.c | 47 ++++++++++++++++++++++++-

-------

Quoted 8 lines
  1 file changed, 35 insertions(+), 12 deletions(-)
sound/soc/codecs/tlv320aic32x4.c +0 -0
index 5af438a00f95..37e14558d7c0 100644

sound/soc/codecs/tlv320aic32x4.c struct aic32x4_priv { · line 55

Quoted 6 lines
sound/soc/codecs/tlv320aic32x4.c +3 -0
@@ -50,6 +50,28 @@ struct aic32x4_priv {
  	struct device *dev;
  };
 
+static int aic32x4_reset_adc(struct snd_soc_dapm_widget *w,
+			     struct snd_kcontrol *kcontrol, int event) {
+	struct snd_soc_component *component =

snd_soc_dapm_to_component(w->dapm);

sound/soc/codecs/tlv320aic32x4.c struct aic32x4_priv {

Quoted 4 lines
sound/soc/codecs/tlv320aic32x4.c +4 -0
+	u32 adc_reg;
+
+	/*
+	 * Workaround: the datasheet does not mention a required

programming

sound/soc/codecs/tlv320aic32x4.c struct aic32x4_priv { · line 60

Quoted 1 line
sound/soc/codecs/tlv320aic32x4.c +1 -0
+	 * sequence but experiments show the ADC needs to be reset

after each

sound/soc/codecs/tlv320aic32x4.c struct aic32x4_priv {

Quoted 5 lines
sound/soc/codecs/tlv320aic32x4.c +5 -0
+	 * capture to avoid audible artifacts.
+	 */
+	switch (event) {
+	case SND_SOC_DAPM_POST_PMD:
+		adc_reg = snd_soc_component_read32(component,

AIC32X4_ADCSETUP);

This gives me a build error

sound/soc/codecs/tlv320aic32x4.c: In function 'aic32x4_reset_adc':
sound/soc/codecs/tlv320aic32x4.c:66:13: error: implicit declaration of function 'snd_soc_component_read32'; did you mean 'snd_soc_component_read'? [-Werror=implicit-function-declaration]
66 | adc_reg = snd_soc_component_read32(component,

Quoted 8 lines
AIC32X4_ADCSETUP);
       |             ^~~~~~~~~~~~~~~~~~~~~~~~
       |             snd_soc_component_read

Also you should check the return to make sure it is valid.

Dan

Hi Dan,

This code patch is created based on the kernel version 5.8-rc4.
The register reading and writing are copied from the function aic32x4_component_probe. May I know the version of the kernel you are applying the patch on?

Thanks,
Regards,
Michael

#8 lore raw

Re: [PATCH 3/3] ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

Quoted 10 lines · Michael Wei Hong
Quoted 9 lines

From: Mark Brown <[email protected]>
Sent: Thursday, 30 July, 2020 8:34 PM
On Thu, Jul 30, 2020 at 05:46:20AM +0000, Sit, Michael Wei Hong wrote:
From: Alsa-devel <[email protected]> On Behalf Of Sit, Michael Wei Hong
Sent: Thursday, 30 July, 2020 1:46 PM
From: Dan Murphy <[email protected]>
Sent: Wednesday, 29 July, 2020 8:31 PM
On 7/29/20 2:32 AM, Michael Sit Wei Hong wrote:

Quoted 2 lines

This code patch is created based on the kernel version 5.8-rc4.
The register reading and writing are copied from the function aic32x4_component_probe.

Side note. When formatting the patch series, add --base to the git format-patch, so it will add it to cover letter.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#9 lore raw

Re: [PATCH 3/3] ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

In reply to Sit, Michael Wei Hong
Quoted 3 lines · Michael Wei Hong

This code patch is created based on the kernel version 5.8-rc4.
The register reading and writing are copied from the function aic32x4_component_probe. May I know the version of the kernel you are applying the patch on?

The trees for each subsystem are listed in MAINTAINERS, or you can look and see the trees that linux-next is pulling from. In the case of ASoC

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Please delete unneeded context from mails when replying. Doing this makes it much easier to find your reply in the message, helping ensure it won't be missed by people scrolling through the irrelevant quoted material.

#10 lore raw

RE: [PATCH 3/3] ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

In reply to Sit, Michael Wei Hong
Quoted 92 lines

-----Original Message-----
From: Sit, Michael Wei Hong
Sent: Monday, 3 August, 2020 9:54 AM
To: Dan Murphy <[email protected]>
Cc: Mark Brown <[email protected]>; alsa-devel@alsa- project.org; [email protected]; [email protected]; Rojewski, Cezary <[email protected]>; Shevchenko, Andriy <[email protected]>; [email protected]; Sia, Jee Heng <[email protected]>; [email protected]; [email protected]
Subject: RE: [PATCH 3/3] ASoC: codec: tlv3204: Moving GPIO reset and add ADC reset

Quoted 3 lines · Michael Sit Wei Hong
Quoted 1 line

Moving GPIO reset to a later stage and before clock registration

to

Quoted 4 lines
Quoted 4 lines

ensure that the host system and codec clocks are in sync. If the host register clock values prior to gpio reset, the last configured codec clock is registered to the host. The codec then gets gpio resetted setting the codec clocks to their default value, causing a

mismatch.

Quoted 4 lines
Quoted 4 lines

Host system will skip clock setting thinking the codec clocks are already at the requested rate.

ADC reset is added to ensure the next audio capture does not

have

Quoted 4 lines
Quoted 4 lines

undesired artifacts. It is probably related to the original code where the probe function resets the ADC prior to 1st record.

Signed-off-by Michael Sit Wei Hong

<[email protected]>

Quoted 5 lines
Quoted 5 lines
Reviewed-by Pierre-Louis Bossart

<[email protected]>

---
  sound/soc/codecs/tlv320aic32x4.c | 47

++++++++++++++++++++++++-

Quoted 12 lines

-------

Quoted 11 lines
  1 file changed, 35 insertions(+), 12 deletions(-)
sound/soc/codecs/tlv320aic32x4.c +0 -0
index 5af438a00f95..37e14558d7c0 100644
@@ -50,6 +50,28 @@ struct aic32x4_priv {
  	struct device *dev;
  };
 
Quoted 2 lines

sound/soc/codecs/tlv320aic32x4.c struct aic32x4_priv { · line 54

Quoted 2 lines
sound/soc/codecs/tlv320aic32x4.c +2 -0
+static int aic32x4_reset_adc(struct snd_soc_dapm_widget *w,
+			     struct snd_kcontrol *kcontrol, int event)

{

Quoted 8 lines

sound/soc/codecs/tlv320aic32x4.c struct aic32x4_priv { · line 55

Quoted 1 line
sound/soc/codecs/tlv320aic32x4.c +1 -0
+	struct snd_soc_component *component =

snd_soc_dapm_to_component(w->dapm);

sound/soc/codecs/tlv320aic32x4.c struct aic32x4_priv {

Quoted 4 lines
sound/soc/codecs/tlv320aic32x4.c +4 -0
+	u32 adc_reg;
+
+	/*
+	 * Workaround: the datasheet does not mention a required

programming

sound/soc/codecs/tlv320aic32x4.c struct aic32x4_priv { · line 60

Quoted 1 line
sound/soc/codecs/tlv320aic32x4.c +1 -0
+	 * sequence but experiments show the ADC needs to be

reset

Quoted 11 lines

after each

sound/soc/codecs/tlv320aic32x4.c struct aic32x4_priv {

Quoted 5 lines
sound/soc/codecs/tlv320aic32x4.c +5 -0
+	 * capture to avoid audible artifacts.
+	 */
+	switch (event) {
+	case SND_SOC_DAPM_POST_PMD:
+		adc_reg = snd_soc_component_read32(component,

AIC32X4_ADCSETUP);

This gives me a build error

sound/soc/codecs/tlv320aic32x4.c: In function

'aic32x4_reset_adc':

Quoted 1 line

sound/soc/codecs/tlv320aic32x4.c:66:13: error: implicit

declaration of

Quoted 2 lines

function 'snd_soc_component_read32'; did you mean 'snd_soc_component_read'? [-Werror=implicit-function-

declaration]

Quoted 9 lines

66 | adc_reg = snd_soc_component_read32(component,

AIC32X4_ADCSETUP);
       |             ^~~~~~~~~~~~~~~~~~~~~~~~
       |             snd_soc_component_read

Also you should check the return to make sure it is valid.

Dan

Hi Dan,

Quoted 8 lines

This code patch is created based on the kernel version 5.8-rc4. The register reading and writing are copied from the function aic32x4_component_probe.
May I know the version of the kernel you are applying the patch on?

Thanks,
Regards,
Michael

I have tried to build the kernel with the patches applied on
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
for-next branch and also on the linux-next branch from
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
Both of them are not throwing errors when I enable the config to build the codec driver.

Can you double confirm the branch you are building the kernel from?