All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Keeping <john@metanate.com>
To: alsa-devel@alsa-project.org
Cc: linux-kernel@vger.kernel.org, Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
	Takashi Iwai <tiwai@suse.com>, John Keeping <john@metanate.com>
Subject: [PATCH 2/9] ASoC: es8328: Fix ADC format setup
Date: Mon,  9 May 2016 12:24:30 +0100	[thread overview]
Message-ID: <20160509112437.8924-3-john@metanate.com> (raw)
In-Reply-To: <20160509112437.8924-1-john@metanate.com>

The ADCCONTROL4 and DACCONTROL1 registers are similar but not identical,
with the DACCONTROL1 having each field starting one bit higher than
ADCCONTROL4.

Instead of introducing a magic shift, add new constants for the values
in ADCCONTROL4 and use a second variable to setup the ADC.

Signed-off-by: John Keeping <john@metanate.com>
---
 sound/soc/codecs/es8328.c | 16 ++++++++++------
 sound/soc/codecs/es8328.h | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c
index 3ca89ae32889..63e82628222c 100644
--- a/sound/soc/codecs/es8328.c
+++ b/sound/soc/codecs/es8328.c
@@ -493,7 +493,8 @@ static int es8328_set_dai_fmt(struct snd_soc_dai *codec_dai,
 		unsigned int fmt)
 {
 	struct snd_soc_codec *codec = codec_dai->codec;
-	u8 mode = ES8328_DACCONTROL1_DACWL_16;
+	u8 dac_mode = ES8328_DACCONTROL1_DACWL_16;
+	u8 adc_mode = ES8328_ADCCONTROL4_ADCWL_16;
 
 	/* set master/slave audio interface */
 	if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBM_CFM)
@@ -502,13 +503,16 @@ static int es8328_set_dai_fmt(struct snd_soc_dai *codec_dai,
 	/* interface format */
 	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
 	case SND_SOC_DAIFMT_I2S:
-		mode |= ES8328_DACCONTROL1_DACFORMAT_I2S;
+		dac_mode |= ES8328_DACCONTROL1_DACFORMAT_I2S;
+		adc_mode |= ES8328_ADCCONTROL4_ADCFORMAT_I2S;
 		break;
 	case SND_SOC_DAIFMT_RIGHT_J:
-		mode |= ES8328_DACCONTROL1_DACFORMAT_RJUST;
+		dac_mode |= ES8328_DACCONTROL1_DACFORMAT_RJUST;
+		adc_mode |= ES8328_ADCCONTROL4_ADCFORMAT_RJUST;
 		break;
 	case SND_SOC_DAIFMT_LEFT_J:
-		mode |= ES8328_DACCONTROL1_DACFORMAT_LJUST;
+		dac_mode |= ES8328_DACCONTROL1_DACFORMAT_LJUST;
+		adc_mode |= ES8328_ADCCONTROL4_ADCFORMAT_LJUST;
 		break;
 	default:
 		return -EINVAL;
@@ -518,8 +522,8 @@ static int es8328_set_dai_fmt(struct snd_soc_dai *codec_dai,
 	if ((fmt & SND_SOC_DAIFMT_INV_MASK) != SND_SOC_DAIFMT_NB_NF)
 		return -EINVAL;
 
-	snd_soc_write(codec, ES8328_DACCONTROL1, mode);
-	snd_soc_write(codec, ES8328_ADCCONTROL4, mode);
+	snd_soc_write(codec, ES8328_DACCONTROL1, dac_mode);
+	snd_soc_write(codec, ES8328_ADCCONTROL4, adc_mode);
 
 	/* Master serial port mode, with BCLK generated automatically */
 	snd_soc_update_bits(codec, ES8328_MASTERMODE,
diff --git a/sound/soc/codecs/es8328.h b/sound/soc/codecs/es8328.h
index 156c748c89c7..5a4af014e516 100644
--- a/sound/soc/codecs/es8328.h
+++ b/sound/soc/codecs/es8328.h
@@ -84,7 +84,22 @@ int es8328_probe(struct device *dev, struct regmap *regmap);
 #define ES8328_ADCCONTROL1	0x09
 #define ES8328_ADCCONTROL2	0x0a
 #define ES8328_ADCCONTROL3	0x0b
+
 #define ES8328_ADCCONTROL4	0x0c
+#define ES8328_ADCCONTROL4_ADCFORMAT_I2S (0 << 0)
+#define ES8328_ADCCONTROL4_ADCFORMAT_LJUST (1 << 0)
+#define ES8328_ADCCONTROL4_ADCFORMAT_RJUST (2 << 0)
+#define ES8328_ADCCONTROL4_ADCFORMAT_PCM (3 << 0)
+#define ES8328_ADCCONTROL4_ADCWL_24 (0 << 2)
+#define ES8328_ADCCONTROL4_ADCWL_20 (1 << 2)
+#define ES8328_ADCCONTROL4_ADCWL_18 (2 << 2)
+#define ES8328_ADCCONTROL4_ADCWL_16 (3 << 2)
+#define ES8328_ADCCONTROL4_ADCWL_32 (4 << 2)
+#define ES8328_ADCCONTROL4_ADCLRP_I2S_POL_NORMAL (0 << 5)
+#define ES8328_ADCCONTROL4_ADCLRP_I2S_POL_INV (1 << 5)
+#define ES8328_ADCCONTROL4_ADCLRP_PCM_MSB_CLK2 (0 << 5)
+#define ES8328_ADCCONTROL4_ADCLRP_PCM_MSB_CLK1 (1 << 5)
+
 #define ES8328_ADCCONTROL5	0x0d
 #define ES8328_ADCCONTROL5_RATEMASK (0x1f << 0)
 
-- 
2.8.0.rc4.238.g874082a

  parent reply	other threads:[~2016-05-09 11:24 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-09 11:24 [PATCH 0/9] ASoC: es8328 codec improvements John Keeping
2016-05-09 11:24 ` [PATCH 1/9] ASoC: es8328: Move clock setup to hw_params John Keeping
2016-05-09 11:24   ` John Keeping
2016-05-10 18:49   ` Applied "ASoC: es8328: Move clock setup to hw_params" to the asoc tree Mark Brown
2016-05-10 18:49     ` Mark Brown
2016-05-09 11:24 ` John Keeping [this message]
2016-05-10 18:49   ` Applied "ASoC: es8328: Fix ADC format setup" " Mark Brown
2016-05-10 18:49     ` Mark Brown
2016-05-09 11:24 ` [PATCH 3/9] ASoC: es8328: Fix mask for VMIDSEL John Keeping
2016-05-10 18:49   ` Applied "ASoC: es8328: Fix mask for VMIDSEL" to the asoc tree Mark Brown
2016-05-10 18:49     ` Mark Brown
2016-05-09 11:24 ` [PATCH 4/9] ASoC: es8328: Use single R/W for regmap John Keeping
2016-05-10 18:49   ` Applied "ASoC: es8328: Use single R/W for regmap" to the asoc tree Mark Brown
2016-05-10 18:49     ` Mark Brown
2016-05-09 11:24 ` [PATCH 5/9] ASoC: es8328: Use more suitable definition for mic bias John Keeping
2016-05-10 17:53   ` Mark Brown
2016-05-12 11:01     ` John Keeping
2016-05-12 11:12       ` Mark Brown
2016-05-12 12:55         ` [PATCH] ASoC: dapm: deprecate MICBIAS widget type John Keeping
2016-05-13  7:59       ` Applied "ASoC: dapm: deprecate MICBIAS widget type" to the asoc tree Mark Brown
2016-05-13  7:59         ` Mark Brown
2016-05-09 11:24 ` [PATCH 6/9] ASoC: es8328: Move sample size setup to hw_params John Keeping
2016-05-09 11:24   ` John Keeping
2016-05-10 18:49   ` Applied "ASoC: es8328: Move sample size setup to hw_params" to the asoc tree Mark Brown
2016-05-10 18:49     ` Mark Brown
2016-05-09 11:24 ` [PATCH 7/9] ASoC: es8328: Support more sample formats John Keeping
2016-05-10 18:49   ` Applied "ASoC: es8328: Support more sample formats" to the asoc tree Mark Brown
2016-05-10 18:49     ` Mark Brown
2016-05-09 11:24 ` [PATCH 8/9] ASoC: es8328: Support more sample rates John Keeping
2016-05-10 18:49   ` Applied "ASoC: es8328: Support more sample rates" to the asoc tree Mark Brown
2016-05-10 18:49     ` Mark Brown
2016-05-09 11:24 ` [PATCH 9/9] ASoC: es8328: Set symmetric rates John Keeping
2016-05-09 11:24   ` John Keeping
2016-05-10 18:49   ` Applied "ASoC: es8328: Set symmetric rates" to the asoc tree Mark Brown
2016-05-10 18:49     ` Mark Brown

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=20160509112437.8924-3-john@metanate.com \
    --to=john@metanate.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.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 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.