[alsa-devel] [PATCH] ASoC:nau8825: automatic LRCK and BCLK divide in master mode
Provide the automatic configurable LRC and BCLK divide. The bit clock rate can be chosen by userspace. The driver will make configurations of LRCK and BCLK automatically when playback or capture in master mode.
Signed-off-by: John Hsu KCHSU0@nuvoton.com --- sound/soc/codecs/nau8825.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/nau8825.h | 1 + 2 files changed, 57 insertions(+)
diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 4576f98..502443b 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -1007,6 +1007,42 @@ static int nau8825_biq_coeff_put(struct snd_kcontrol *kcontrol, return 0; }
+int nau8825_bclk_rate_get_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; + struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + unsigned int item; + + item = snd_soc_enum_val_to_item(e, nau8825->bclk_rate); + ucontrol->value.enumerated.item[0] = item; + + return 0; +} + +int nau8825_bclk_rate_put_enum(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; + struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + unsigned int *item = ucontrol->value.enumerated.item; + unsigned int val; + bool change = false; + + if (item[0] >= e->items) + return -EINVAL; + + val = snd_soc_enum_item_to_val(e, item[0]); + if (val != nau8825->bclk_rate) { + nau8825->bclk_rate = val; + change = true; + } + + return change; +} + static const char * const nau8825_biq_path[] = { "ADC", "DAC" }; @@ -1031,6 +1067,13 @@ static const struct soc_enum nau8825_dac_oversampl_enum = SOC_ENUM_SINGLE(NAU8825_REG_DAC_CTRL1, NAU8825_DAC_OVERSAMPLE_SFT, ARRAY_SIZE(nau8825_dac_oversampl), nau8825_dac_oversampl);
+static const char * const nau8825_bclk_rate[] = { + "128fs", "64fs", "32fs" }; + +static const struct soc_enum nau8825_bclk_rate_enum = + SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, + ARRAY_SIZE(nau8825_bclk_rate), nau8825_bclk_rate); + static const DECLARE_TLV_DB_MINMAX_MUTE(adc_vol_tlv, -10300, 2400); static const DECLARE_TLV_DB_MINMAX_MUTE(sidetone_vol_tlv, -4200, 0); static const DECLARE_TLV_DB_MINMAX(dac_vol_tlv, -5400, 0); @@ -1055,6 +1098,9 @@ static const struct snd_kcontrol_new nau8825_controls[] = { SOC_ENUM("BIQ Path Select", nau8825_biq_path_enum), SND_SOC_BYTES_EXT("BIQ Coefficients", 20, nau8825_biq_coeff_get, nau8825_biq_coeff_put), + + SOC_ENUM_EXT("BCLK rate", nau8825_bclk_rate_enum, + nau8825_bclk_rate_get_enum, nau8825_bclk_rate_put_enum), };
/* DAC Mux 0x33[9] and 0x34[9] */ @@ -1343,6 +1389,14 @@ static int nau8825_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, NAU8825_I2S_MS_MASK, ctrl2_val);
+ if (ctrl2_val & NAU8825_I2S_MS_MASTER) { + regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, + NAU8825_I2S_BLK_DIV_MASK, nau8825->bclk_rate); + regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, + NAU8825_I2S_LRC_DIV_MASK, + (nau8825->bclk_rate + 1) << NAU8825_I2S_LRC_DIV_SFT); + } + /* Release the semaphone. */ nau8825_sema_release(nau8825);
@@ -2497,6 +2551,8 @@ static int nau8825_i2c_probe(struct i2c_client *i2c, return PTR_ERR(nau8825->regmap); nau8825->dev = dev; nau8825->irq = i2c->irq; + /* assign 32fs as default bit clock rate */ + nau8825->bclk_rate = 2; /* Initiate parameters, semaphone and work queue which are needed in * cross talk suppression measurment function. */ diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h index 514fd13..5f2ed8d 100644 --- a/sound/soc/codecs/nau8825.h +++ b/sound/soc/codecs/nau8825.h @@ -476,6 +476,7 @@ struct nau8825 { int xtalk_event_mask; bool xtalk_protect; int imp_rms[NAU8825_XTALK_IMM]; + int bclk_rate; };
int nau8825_enable_jack_detect(struct snd_soc_codec *codec, -- 2.6.4
=========================================================================================== The privileged confidential information contained in this email is intended for use only by the addressees as indicated by the original sender of this email. If you are not the addressee indicated in this email or are not responsible for delivery of the email to such a person, please kindly reply to the sender indicating this fact and delete all copies of it from your computer and network server immediately. Your cooperation is highly appreciated. It is advised that any unauthorized use of confidential information of Nuvoton is strictly prohibited; and any information in this email irrelevant to the official business of Nuvoton shall be deemed as neither given nor endorsed by Nuvoton.
On Thu, Feb 02, 2017 at 03:36:50PM +0800, John Hsu wrote:
Provide the automatic configurable LRC and BCLK divide. The bit clock rate can be chosen by userspace. The driver will make configurations of LRCK and BCLK automatically when playback or capture in master mode.
As far as I can tell this only provides manual selection from userspace, I can't see the code for automatic selection. I'd not expect to see any userspace control of something like this, if there is an override I'd expect it to come from the machine driver, and as I've previously said I'd definitely expect automatic selection to be the default like it is with other CODEC drivers.
Hi, On 2/3/2017 7:57 PM, Mark Brown wrote:
On Thu, Feb 02, 2017 at 03:36:50PM +0800, John Hsu wrote:
Provide the automatic configurable LRC and BCLK divide. The bit clock rate can be chosen by userspace. The driver will make configurations of LRCK and BCLK automatically when playback or capture in master mode.
As far as I can tell this only provides manual selection from userspace, I can't see the code for automatic selection. I'd not expect to see any userspace control of something like this, if there is an override I'd expect it to come from the machine driver, and as I've previously said I'd definitely expect automatic selection to be the default like it is with other CODEC drivers.
I see. Maybe I can get the bit clock and frame sync information when hardware parameter. According to the information to make LRC and BCLK divide confirguration.
=========================================================================================== The privileged confidential information contained in this email is intended for use only by the addressees as indicated by the original sender of this email. If you are not the addressee indicated in this email or are not responsible for delivery of the email to such a person, please kindly reply to the sender indicating this fact and delete all copies of it from your computer and network server immediately. Your cooperation is highly appreciated. It is advised that any unauthorized use of confidential information of Nuvoton is strictly prohibited; and any information in this email irrelevant to the official business of Nuvoton shall be deemed as neither given nor endorsed by Nuvoton.
On Tue, Feb 07, 2017 at 10:24:37AM +0800, John Hsu wrote:
I see. Maybe I can get the bit clock and frame sync information when hardware parameter. According to the information to make LRC and BCLK divide confirguration.
Yes, that's the normal way this is done.
participants (2)
-
John Hsu -
Mark Brown