From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Hans de Goede <hdegoede@redhat.com>,
Cezary Rojewski <cezary.rojewski@intel.com>,
Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Jie Yang <yang.jie@linux.intel.com>,
Mark Brown <broonie@kernel.org>,
Oder Chiou <oder_chiou@realtek.com>
Cc: alsa-devel@alsa-project.org, stable@vger.kernel.org
Subject: Re: [PATCH 1/6] ASoC: Intel: cht_bsw_rt5672: Change bus format to I2S 2 channel
Date: Mon, 29 Jun 2020 10:06:14 -0500 [thread overview]
Message-ID: <4a9413ef-89d9-427b-27e9-a3b2df6f310a@linux.intel.com> (raw)
In-Reply-To: <20200628155231.71089-2-hdegoede@redhat.com>
On 6/28/20 10:52 AM, Hans de Goede wrote:
> The default mode for SSP configuration is TDM 4 slot and so far we were
> using this for the bus format on cht-bsw-rt56732 boards.
>
> One board, the Lenovo Miix 2 10 uses not 1 but 2 codecs connected to SSP2.
> The second piggy-backed, output-only codec is inside the keyboard-dock
> (which has extra speakers). Unlike the main rt5672 codec, we cannot
> configure this codec, it is hard coded to use 2 channel 24 bit I2S.
>
> Using 4 channel TDM leads to the dock speakers codec (which listens in on
> the data send from the SSP to the rt5672 codec) emiting horribly distorted
> sound.
>
> Since we only support 2 channels anyways, there is no need for TDM on any
> cht-bsw-rt5672 designs. So we can simply use I2S 2ch everywhere.
>
> This commit fixes the Lenovo Miix 2 10 dock speakers issue by changing
> the bus format set in cht_codec_fixup() to I2S 2 channel.
>
> This change has been tested on the following devices with a rt5672 codec:
>
> Lenovo Miix 2 10
> Lenovo Thinkpad 8
> Lenovo Thinkpad 10 (gen 1)
>
> Cc: stable@vger.kernel.org
> BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1786723
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> sound/soc/intel/boards/cht_bsw_rt5672.c | 23 +++++++++++------------
> 1 file changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/sound/soc/intel/boards/cht_bsw_rt5672.c b/sound/soc/intel/boards/cht_bsw_rt5672.c
> index 7a43c70a1378..22e432768edb 100644
> --- a/sound/soc/intel/boards/cht_bsw_rt5672.c
> +++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
> @@ -253,21 +253,20 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd,
> params_set_format(params, SNDRV_PCM_FORMAT_S24_LE);
>
> /*
> - * Default mode for SSP configuration is TDM 4 slot
> + * Default mode for SSP configuration is TDM 4 slot. One board/design,
> + * the Lenovo Miix 2 10 uses not 1 but 2 codecs connected to SSP2. The
> + * second piggy-backed, output-only codec is inside the keyboard-dock
> + * (which has extra speakers). Unlike the main rt5672 codec, we cannot
> + * configure this codec, it is hard coded to use 2 channel 24 bit I2S.
> + * Since we only support 2 channels anyways, there is no need for TDM
> + * on any cht-bsw-rt5672 designs. So we simply use I2S 2ch everywhere.
> */
The change looks fine, but you may want to add additional comments to
explain what happens here.
The default mode for the SSP configuration is TDM 4 slot for the cpu-dai
(hard-coded in DSP firmware)
the default mode for the SSP configuration is I2S for the codec-dai
(hard-coded in the 'SSP2-Codec" .dai_fmt masks, so far unused).
So with this change, you trade one dynamic configuration for another
(was codec, not cpu). It works because of the pre-existing hard-coded
values for the parts that are not set in this function.
> - ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 0),
> - SND_SOC_DAIFMT_DSP_B |
> - SND_SOC_DAIFMT_IB_NF |
> + ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
> + SND_SOC_DAIFMT_I2S |
> + SND_SOC_DAIFMT_NB_NF |
> SND_SOC_DAIFMT_CBS_CFS);
> if (ret < 0) {
> - dev_err(rtd->dev, "can't set format to TDM %d\n", ret);
> - return ret;
> - }
> -
> - /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */
> - ret = snd_soc_dai_set_tdm_slot(asoc_rtd_to_codec(rtd, 0), 0xF, 0xF, 4, 24);
> - if (ret < 0) {
> - dev_err(rtd->dev, "can't set codec TDM slot %d\n", ret);
> + dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); > return ret;
> }
>
>
next prev parent reply other threads:[~2020-06-29 18:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200628155231.71089-1-hdegoede@redhat.com>
2020-06-28 15:52 ` [PATCH 1/6] ASoC: Intel: cht_bsw_rt5672: Change bus format to I2S 2 channel Hans de Goede
2020-06-29 15:06 ` Pierre-Louis Bossart [this message]
2020-06-29 19:38 ` Mark Brown
2020-07-01 19:33 ` Sasha Levin
2020-07-01 19:46 ` Pierre-Louis Bossart
2020-07-03 8:28 ` Hans de Goede
2020-07-03 17:03 ` Mark Brown
2020-07-10 14:02 ` Sasha Levin
2020-06-28 15:52 ` [PATCH 2/6] ASoC: rt5670: Correct RT5670_LDO_SEL_MASK Hans de Goede
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=4a9413ef-89d9-427b-27e9-a3b2df6f310a@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=hdegoede@redhat.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=oder_chiou@realtek.com \
--cc=stable@vger.kernel.org \
--cc=yang.jie@linux.intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).