All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC: da7213: add support for DSP modes
@ 2017-11-08 22:42 Pierre-Louis Bossart
  2017-11-09 10:39 ` Adam Thomson
  2017-11-09 17:43 ` Applied "ASoC: da7213: add support for DSP modes" to the asoc tree Mark Brown
  0 siblings, 2 replies; 3+ messages in thread
From: Pierre-Louis Bossart @ 2017-11-08 22:42 UTC (permalink / raw)
  To: alsa-devel; +Cc: tiwai, Adam Thomson, broonie, Pierre-Louis Bossart

DSP modes are documented in the data sheet but not enabled in the driver.
The work-around already implemented for DA7218/9 is also required to
make sure the bit clock handling in DSP modes follows ASoC conventions.

Tested with ARD-AUDIO-DA7212 and Minnowmax Turbot boards

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/codecs/da7213.c | 58 +++++++++++++++++++++++++++++++++++++++--------
 sound/soc/codecs/da7213.h |  1 +
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index cc0b2d2eaf15..41d9b1da27c2 100644
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1220,6 +1220,7 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 	struct snd_soc_codec *codec = codec_dai->codec;
 	struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
 	u8 dai_clk_mode = 0, dai_ctrl = 0;
+	u8 dai_offset = 0;
 
 	/* Set master/slave mode */
 	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
@@ -1234,17 +1235,46 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 	}
 
 	/* Set clock normal/inverted */
-	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
-	case SND_SOC_DAIFMT_NB_NF:
-		break;
-	case SND_SOC_DAIFMT_NB_IF:
-		dai_clk_mode |= DA7213_DAI_WCLK_POL_INV;
-		break;
-	case SND_SOC_DAIFMT_IB_NF:
-		dai_clk_mode |= DA7213_DAI_CLK_POL_INV;
+	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+	case SND_SOC_DAIFMT_I2S:
+	case SND_SOC_DAIFMT_LEFT_J:
+	case SND_SOC_DAIFMT_RIGHT_J:
+		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+		case SND_SOC_DAIFMT_NB_NF:
+			break;
+		case SND_SOC_DAIFMT_NB_IF:
+			dai_clk_mode |= DA7213_DAI_WCLK_POL_INV;
+			break;
+		case SND_SOC_DAIFMT_IB_NF:
+			dai_clk_mode |= DA7213_DAI_CLK_POL_INV;
+			break;
+		case SND_SOC_DAIFMT_IB_IF:
+			dai_clk_mode |= DA7213_DAI_WCLK_POL_INV |
+					DA7213_DAI_CLK_POL_INV;
+			break;
+		default:
+			return -EINVAL;
+		}
 		break;
-	case SND_SOC_DAIFMT_IB_IF:
-		dai_clk_mode |= DA7213_DAI_WCLK_POL_INV | DA7213_DAI_CLK_POL_INV;
+	case SND_SOC_DAI_FORMAT_DSP_A:
+	case SND_SOC_DAI_FORMAT_DSP_B:
+		/* The bclk is inverted wrt ASoC conventions */
+		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+		case SND_SOC_DAIFMT_NB_NF:
+			dai_clk_mode |= DA7213_DAI_CLK_POL_INV;
+			break;
+		case SND_SOC_DAIFMT_NB_IF:
+			dai_clk_mode |= DA7213_DAI_WCLK_POL_INV |
+					DA7213_DAI_CLK_POL_INV;
+			break;
+		case SND_SOC_DAIFMT_IB_NF:
+			break;
+		case SND_SOC_DAIFMT_IB_IF:
+			dai_clk_mode |= DA7213_DAI_WCLK_POL_INV;
+			break;
+		default:
+			return -EINVAL;
+		}
 		break;
 	default:
 		return -EINVAL;
@@ -1261,6 +1291,13 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 	case SND_SOC_DAIFMT_RIGHT_J:
 		dai_ctrl |= DA7213_DAI_FORMAT_RIGHT_J;
 		break;
+	case SND_SOC_DAI_FORMAT_DSP_A: /* L data MSB after FRM LRC */
+		dai_ctrl |= DA7213_DAI_FORMAT_DSP;
+		dai_offset = 1;
+		break;
+	case SND_SOC_DAI_FORMAT_DSP_B: /* L data MSB during FRM LRC */
+		dai_ctrl |= DA7213_DAI_FORMAT_DSP;
+		break;
 	default:
 		return -EINVAL;
 	}
@@ -1271,6 +1308,7 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 	snd_soc_write(codec, DA7213_DAI_CLK_MODE, dai_clk_mode);
 	snd_soc_update_bits(codec, DA7213_DAI_CTRL, DA7213_DAI_FORMAT_MASK,
 			    dai_ctrl);
+	snd_soc_write(codec, DA7213_DAI_OFFSET, dai_offset);
 
 	return 0;
 }
diff --git a/sound/soc/codecs/da7213.h b/sound/soc/codecs/da7213.h
index 16ef56f77cd4..5a78dba1dcb5 100644
--- a/sound/soc/codecs/da7213.h
+++ b/sound/soc/codecs/da7213.h
@@ -188,6 +188,7 @@
 #define DA7213_DAI_FORMAT_I2S_MODE				(0x0 << 0)
 #define DA7213_DAI_FORMAT_LEFT_J				(0x1 << 0)
 #define DA7213_DAI_FORMAT_RIGHT_J				(0x2 << 0)
+#define DA7213_DAI_FORMAT_DSP					(0x3 << 0)
 #define DA7213_DAI_FORMAT_MASK					(0x3 << 0)
 #define DA7213_DAI_WORD_LENGTH_S16_LE				(0x0 << 2)
 #define DA7213_DAI_WORD_LENGTH_S20_LE				(0x1 << 2)
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: da7213: add support for DSP modes
  2017-11-08 22:42 [PATCH] ASoC: da7213: add support for DSP modes Pierre-Louis Bossart
@ 2017-11-09 10:39 ` Adam Thomson
  2017-11-09 17:43 ` Applied "ASoC: da7213: add support for DSP modes" to the asoc tree Mark Brown
  1 sibling, 0 replies; 3+ messages in thread
From: Adam Thomson @ 2017-11-09 10:39 UTC (permalink / raw)
  To: Pierre-Louis Bossart, alsa-devel; +Cc: tiwai, Adam Thomson, broonie

On 08 November 2017 22:43, Pierre-Louis Bossart wrote:

> DSP modes are documented in the data sheet but not enabled in the driver.
> The work-around already implemented for DA7218/9 is also required to
> make sure the bit clock handling in DSP modes follows ASoC conventions.
> 
> Tested with ARD-AUDIO-DA7212 and Minnowmax Turbot boards
> 
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>

> ---
>  sound/soc/codecs/da7213.c | 58 +++++++++++++++++++++++++++++++++++++++---
> -----
>  sound/soc/codecs/da7213.h |  1 +
>  2 files changed, 49 insertions(+), 10 deletions(-)
> 
> diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
> index cc0b2d2eaf15..41d9b1da27c2 100644
> --- a/sound/soc/codecs/da7213.c
> +++ b/sound/soc/codecs/da7213.c
> @@ -1220,6 +1220,7 @@ static int da7213_set_dai_fmt(struct snd_soc_dai
> *codec_dai, unsigned int fmt)
>  	struct snd_soc_codec *codec = codec_dai->codec;
>  	struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
>  	u8 dai_clk_mode = 0, dai_ctrl = 0;
> +	u8 dai_offset = 0;
> 
>  	/* Set master/slave mode */
>  	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
> @@ -1234,17 +1235,46 @@ static int da7213_set_dai_fmt(struct snd_soc_dai
> *codec_dai, unsigned int fmt)
>  	}
> 
>  	/* Set clock normal/inverted */
> -	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
> -	case SND_SOC_DAIFMT_NB_NF:
> -		break;
> -	case SND_SOC_DAIFMT_NB_IF:
> -		dai_clk_mode |= DA7213_DAI_WCLK_POL_INV;
> -		break;
> -	case SND_SOC_DAIFMT_IB_NF:
> -		dai_clk_mode |= DA7213_DAI_CLK_POL_INV;
> +	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
> +	case SND_SOC_DAIFMT_I2S:
> +	case SND_SOC_DAIFMT_LEFT_J:
> +	case SND_SOC_DAIFMT_RIGHT_J:
> +		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
> +		case SND_SOC_DAIFMT_NB_NF:
> +			break;
> +		case SND_SOC_DAIFMT_NB_IF:
> +			dai_clk_mode |= DA7213_DAI_WCLK_POL_INV;
> +			break;
> +		case SND_SOC_DAIFMT_IB_NF:
> +			dai_clk_mode |= DA7213_DAI_CLK_POL_INV;
> +			break;
> +		case SND_SOC_DAIFMT_IB_IF:
> +			dai_clk_mode |= DA7213_DAI_WCLK_POL_INV |
> +					DA7213_DAI_CLK_POL_INV;
> +			break;
> +		default:
> +			return -EINVAL;
> +		}
>  		break;
> -	case SND_SOC_DAIFMT_IB_IF:
> -		dai_clk_mode |= DA7213_DAI_WCLK_POL_INV |
> DA7213_DAI_CLK_POL_INV;
> +	case SND_SOC_DAI_FORMAT_DSP_A:
> +	case SND_SOC_DAI_FORMAT_DSP_B:
> +		/* The bclk is inverted wrt ASoC conventions */
> +		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
> +		case SND_SOC_DAIFMT_NB_NF:
> +			dai_clk_mode |= DA7213_DAI_CLK_POL_INV;
> +			break;
> +		case SND_SOC_DAIFMT_NB_IF:
> +			dai_clk_mode |= DA7213_DAI_WCLK_POL_INV |
> +					DA7213_DAI_CLK_POL_INV;
> +			break;
> +		case SND_SOC_DAIFMT_IB_NF:
> +			break;
> +		case SND_SOC_DAIFMT_IB_IF:
> +			dai_clk_mode |= DA7213_DAI_WCLK_POL_INV;
> +			break;
> +		default:
> +			return -EINVAL;
> +		}
>  		break;
>  	default:
>  		return -EINVAL;
> @@ -1261,6 +1291,13 @@ static int da7213_set_dai_fmt(struct snd_soc_dai
> *codec_dai, unsigned int fmt)
>  	case SND_SOC_DAIFMT_RIGHT_J:
>  		dai_ctrl |= DA7213_DAI_FORMAT_RIGHT_J;
>  		break;
> +	case SND_SOC_DAI_FORMAT_DSP_A: /* L data MSB after FRM LRC */
> +		dai_ctrl |= DA7213_DAI_FORMAT_DSP;
> +		dai_offset = 1;
> +		break;
> +	case SND_SOC_DAI_FORMAT_DSP_B: /* L data MSB during FRM LRC */
> +		dai_ctrl |= DA7213_DAI_FORMAT_DSP;
> +		break;
>  	default:
>  		return -EINVAL;
>  	}
> @@ -1271,6 +1308,7 @@ static int da7213_set_dai_fmt(struct snd_soc_dai
> *codec_dai, unsigned int fmt)
>  	snd_soc_write(codec, DA7213_DAI_CLK_MODE, dai_clk_mode);
>  	snd_soc_update_bits(codec, DA7213_DAI_CTRL,
> DA7213_DAI_FORMAT_MASK,
>  			    dai_ctrl);
> +	snd_soc_write(codec, DA7213_DAI_OFFSET, dai_offset);
> 
>  	return 0;
>  }
> diff --git a/sound/soc/codecs/da7213.h b/sound/soc/codecs/da7213.h
> index 16ef56f77cd4..5a78dba1dcb5 100644
> --- a/sound/soc/codecs/da7213.h
> +++ b/sound/soc/codecs/da7213.h
> @@ -188,6 +188,7 @@
>  #define DA7213_DAI_FORMAT_I2S_MODE				(0x0 << 0)
>  #define DA7213_DAI_FORMAT_LEFT_J				(0x1 << 0)
>  #define DA7213_DAI_FORMAT_RIGHT_J				(0x2 << 0)
> +#define DA7213_DAI_FORMAT_DSP					(0x3 << 0)
>  #define DA7213_DAI_FORMAT_MASK					(0x3 << 0)
>  #define DA7213_DAI_WORD_LENGTH_S16_LE				(0x0 << 2)
>  #define DA7213_DAI_WORD_LENGTH_S20_LE				(0x1 << 2)
> --
> 2.11.0

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Applied "ASoC: da7213: add support for DSP modes" to the asoc tree
  2017-11-08 22:42 [PATCH] ASoC: da7213: add support for DSP modes Pierre-Louis Bossart
  2017-11-09 10:39 ` Adam Thomson
@ 2017-11-09 17:43 ` Mark Brown
  1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2017-11-09 17:43 UTC (permalink / raw)
  To: Pierre-Louis Bossart; +Cc: tiwai, Adam Thomson, broonie, alsa-devel

The patch

   ASoC: da7213: add support for DSP modes

has been applied to the asoc tree at

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

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From e0d746cc0155a51cc24eb56286cd21a2c5aa4985 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Wed, 8 Nov 2017 16:42:31 -0600
Subject: [PATCH] ASoC: da7213: add support for DSP modes

DSP modes are documented in the data sheet but not enabled in the driver.
The work-around already implemented for DA7218/9 is also required to
make sure the bit clock handling in DSP modes follows ASoC conventions.

Tested with ARD-AUDIO-DA7212 and Minnowmax Turbot boards

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/codecs/da7213.c | 58 +++++++++++++++++++++++++++++++++++++++--------
 sound/soc/codecs/da7213.h |  1 +
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c
index cc0b2d2eaf15..41d9b1da27c2 100644
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
@@ -1220,6 +1220,7 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 	struct snd_soc_codec *codec = codec_dai->codec;
 	struct da7213_priv *da7213 = snd_soc_codec_get_drvdata(codec);
 	u8 dai_clk_mode = 0, dai_ctrl = 0;
+	u8 dai_offset = 0;
 
 	/* Set master/slave mode */
 	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
@@ -1234,17 +1235,46 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 	}
 
 	/* Set clock normal/inverted */
-	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
-	case SND_SOC_DAIFMT_NB_NF:
-		break;
-	case SND_SOC_DAIFMT_NB_IF:
-		dai_clk_mode |= DA7213_DAI_WCLK_POL_INV;
-		break;
-	case SND_SOC_DAIFMT_IB_NF:
-		dai_clk_mode |= DA7213_DAI_CLK_POL_INV;
+	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+	case SND_SOC_DAIFMT_I2S:
+	case SND_SOC_DAIFMT_LEFT_J:
+	case SND_SOC_DAIFMT_RIGHT_J:
+		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+		case SND_SOC_DAIFMT_NB_NF:
+			break;
+		case SND_SOC_DAIFMT_NB_IF:
+			dai_clk_mode |= DA7213_DAI_WCLK_POL_INV;
+			break;
+		case SND_SOC_DAIFMT_IB_NF:
+			dai_clk_mode |= DA7213_DAI_CLK_POL_INV;
+			break;
+		case SND_SOC_DAIFMT_IB_IF:
+			dai_clk_mode |= DA7213_DAI_WCLK_POL_INV |
+					DA7213_DAI_CLK_POL_INV;
+			break;
+		default:
+			return -EINVAL;
+		}
 		break;
-	case SND_SOC_DAIFMT_IB_IF:
-		dai_clk_mode |= DA7213_DAI_WCLK_POL_INV | DA7213_DAI_CLK_POL_INV;
+	case SND_SOC_DAI_FORMAT_DSP_A:
+	case SND_SOC_DAI_FORMAT_DSP_B:
+		/* The bclk is inverted wrt ASoC conventions */
+		switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+		case SND_SOC_DAIFMT_NB_NF:
+			dai_clk_mode |= DA7213_DAI_CLK_POL_INV;
+			break;
+		case SND_SOC_DAIFMT_NB_IF:
+			dai_clk_mode |= DA7213_DAI_WCLK_POL_INV |
+					DA7213_DAI_CLK_POL_INV;
+			break;
+		case SND_SOC_DAIFMT_IB_NF:
+			break;
+		case SND_SOC_DAIFMT_IB_IF:
+			dai_clk_mode |= DA7213_DAI_WCLK_POL_INV;
+			break;
+		default:
+			return -EINVAL;
+		}
 		break;
 	default:
 		return -EINVAL;
@@ -1261,6 +1291,13 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 	case SND_SOC_DAIFMT_RIGHT_J:
 		dai_ctrl |= DA7213_DAI_FORMAT_RIGHT_J;
 		break;
+	case SND_SOC_DAI_FORMAT_DSP_A: /* L data MSB after FRM LRC */
+		dai_ctrl |= DA7213_DAI_FORMAT_DSP;
+		dai_offset = 1;
+		break;
+	case SND_SOC_DAI_FORMAT_DSP_B: /* L data MSB during FRM LRC */
+		dai_ctrl |= DA7213_DAI_FORMAT_DSP;
+		break;
 	default:
 		return -EINVAL;
 	}
@@ -1271,6 +1308,7 @@ static int da7213_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 	snd_soc_write(codec, DA7213_DAI_CLK_MODE, dai_clk_mode);
 	snd_soc_update_bits(codec, DA7213_DAI_CTRL, DA7213_DAI_FORMAT_MASK,
 			    dai_ctrl);
+	snd_soc_write(codec, DA7213_DAI_OFFSET, dai_offset);
 
 	return 0;
 }
diff --git a/sound/soc/codecs/da7213.h b/sound/soc/codecs/da7213.h
index 16ef56f77cd4..5a78dba1dcb5 100644
--- a/sound/soc/codecs/da7213.h
+++ b/sound/soc/codecs/da7213.h
@@ -188,6 +188,7 @@
 #define DA7213_DAI_FORMAT_I2S_MODE				(0x0 << 0)
 #define DA7213_DAI_FORMAT_LEFT_J				(0x1 << 0)
 #define DA7213_DAI_FORMAT_RIGHT_J				(0x2 << 0)
+#define DA7213_DAI_FORMAT_DSP					(0x3 << 0)
 #define DA7213_DAI_FORMAT_MASK					(0x3 << 0)
 #define DA7213_DAI_WORD_LENGTH_S16_LE				(0x0 << 2)
 #define DA7213_DAI_WORD_LENGTH_S20_LE				(0x1 << 2)
-- 
2.15.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-09 17:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-08 22:42 [PATCH] ASoC: da7213: add support for DSP modes Pierre-Louis Bossart
2017-11-09 10:39 ` Adam Thomson
2017-11-09 17:43 ` Applied "ASoC: da7213: add support for DSP modes" to the asoc tree Mark Brown

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.