| Message ID | 1487051073-2350-1-git-send-email-KCHSU0@nuvoton.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Feb 14, 2017 at 01:44:33PM +0800, John Hsu wrote: > Provide the automatic configurable LRC and BCLK divide. The driver > will make configurations of LRC and BCLK automatically according to > BCLK and FS information in master mode. This patch *still* does not apply. Please, try sending to yourself and applying with git am before you resend to me. Check that the patch is not being corrupted when you send it (things like space/tab conversion for example).
Hi, On 2/14/2017 7:09 PM, Mark Brown wrote: > On Tue, Feb 14, 2017 at 01:44:33PM +0800, John Hsu wrote: >> Provide the automatic configurable LRC and BCLK divide. The driver >> will make configurations of LRC and BCLK automatically according to >> BCLK and FS information in master mode. > > This patch *still* does not apply. Please, try sending to yourself and > applying with git am before you resend to me. Check that the patch is > not being corrupted when you send it (things like space/tab conversion > for example). I have resent the patch to myself. And copy the mail content to a new patch. Then try the command as follows, and it seems work fine. git am --signoff < ASoC-nau8825-auto-BCLK-and-LRC-divide.patch Here are the git logs in my site. commit ce7f61934872c0bc701d93de2db39260b44a8ebd Author: John Hsu <KCHSU0@nuvoton.com> Date: Wed Feb 15 17:13:43 2017 +0800 ASoC: nau8825: automatic BCLK and LRC divde in master mode Provide the automatic configurable LRC and BCLK divide. The driver will make configurations of LRC and BCLK automatically according to BCLK and FS information in master mode. Signed-off-by: John Hsu <KCHSU0@nuvoton.com> commit 71d7b89701f4e2bee4710bd229e254156006f69b Merge: 92dfbd1 af4b654 66ead50 Author: Mark Brown <broonie@kernel.org> Date: Thu Feb 9 23:48:22 2017 +0000 Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next commit 92dfbd159676290c359f94ff0e5637eb00d4b170 =========================================================================================== 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 16, 2017 at 10:08:38AM +0800, John Hsu wrote: > On 2/14/2017 7:09 PM, Mark Brown wrote: > > This patch *still* does not apply. Please, try sending to yourself and > > applying with git am before you resend to me. Check that the patch is > > not being corrupted when you send it (things like space/tab conversion > > for example). > I have resent the patch to myself. And copy the mail content to a new > patch. Then try the command as follows, and it seems work fine. > git am --signoff < ASoC-nau8825-auto-BCLK-and-LRC-divide.patch I looked again, you've got at least space/tab conversion problems in there in the copy that ended up in my mailbox. Perhaps there was some temporary problem in the mail system your company uses, can you try resending to me and see if it's sorted?
diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 4576f98..97fbeba 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -1231,7 +1231,7 @@ static int nau8825_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_codec *codec = dai->codec; struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); - unsigned int val_len = 0, osr; + unsigned int val_len = 0, osr, ctrl_val, bclk_fs, bclk_div; nau8825_sema_acquire(nau8825, 3 * HZ); @@ -1261,6 +1261,24 @@ static int nau8825_hw_params(struct snd_pcm_substream *substream, osr_adc_sel[osr].clk_src << NAU8825_CLK_ADC_SRC_SFT); } + /* make BCLK and LRC divde configuration if the codec as master. */ + regmap_read(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, &ctrl_val); + if (ctrl_val & NAU8825_I2S_MS_MASTER) { + /* get the bclk and fs ratio */ + bclk_fs = snd_soc_params_to_bclk(params) / params_rate(params); + if (bclk_fs <= 32) + bclk_div = 2; + else if (bclk_fs <= 64) + bclk_div = 1; + else if (bclk_fs <= 128) + bclk_div = 0; + else + return -EINVAL; + regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, + NAU8825_I2S_LRC_DIV_MASK | NAU8825_I2S_BLK_DIV_MASK, + ((bclk_div + 1) << NAU8825_I2S_LRC_DIV_SFT) | bclk_div); + } + switch (params_width(params)) { case 16: val_len |= NAU8825_I2S_DL_16;
Provide the automatic configurable LRC and BCLK divide. The driver will make configurations of LRC and BCLK automatically according to BCLK and FS information in master mode. Signed-off-by: John Hsu <KCHSU0@nuvoton.com> --- sound/soc/codecs/nau8825.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) -- 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.