From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Brent Lu <brent.lu@intel.com>, alsa-devel@alsa-project.org
Cc: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>,
Cezary Rojewski <cezary.rojewski@intel.com>,
Dharageswari R <dharageswari.r@intel.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
linux-kernel@vger.kernel.org, Jie Yang <yang.jie@linux.intel.com>,
Takashi Iwai <tiwai@suse.com>,
Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Mark Brown <broonie@kernel.org>,
Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>,
Fred Oh <fred.oh@linux.intel.com>, Yong Zhi <yong.zhi@intel.com>
Subject: Re: [PATCH] ASoC: Intel: sof_rt5682: update quirk for cml boards
Date: Wed, 21 Oct 2020 08:56:57 -0500 [thread overview]
Message-ID: <9ae005e9-4cd9-31ef-56cb-504edc4cd503@linux.intel.com> (raw)
In-Reply-To: <20201021072646.7980-1-brent.lu@intel.com>
On 10/21/20 2:26 AM, Brent Lu wrote:
> The default quirk data of sof_rt5682 is for tgl platform. For cml
> platforms to reuse this driver, the flag SOF_RT5682_MCLK_24MHZ is
> necessary to setup codec asrc correctly.
>
> Signed-off-by: Brent Lu <brent.lu@intel.com>
> ---
> sound/soc/intel/boards/sof_rt5682.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
> index ddbb9fe7cc06..fa2c226a444a 100644
> --- a/sound/soc/intel/boards/sof_rt5682.c
> +++ b/sound/soc/intel/boards/sof_rt5682.c
> @@ -768,6 +768,11 @@ static int sof_audio_probe(struct platform_device *pdev)
> /* default number of HDMI DAI's */
> if (!hdmi_num)
> hdmi_num = 3;
> +
> + if (soc_intel_is_cml()) {
> + /* default quirk for sof_rt5682 is for tgl platform */
> + sof_rt5682_quirk |= SOF_RT5682_MCLK_24MHZ;
> + }
That setting is not wrong, but is it sufficient?
see e.g. what we set for existing platforms which need 24 Mhz in this
driver:
DMI quirks:
{
.callback = sof_rt5682_quirk_cb,
.matches = {
DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Hatch"),
},
.driver_data = (void *)(SOF_RT5682_MCLK_EN |
SOF_RT5682_MCLK_24MHZ |
SOF_RT5682_SSP_CODEC(0) |
SOF_SPEAKER_AMP_PRESENT |
SOF_RT5682_SSP_AMP(1)),
},
Board-id quirks:
{
.name = "jsl_rt5682_rt1015",
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
SOF_RT5682_MCLK_24MHZ |
SOF_RT5682_SSP_CODEC(0) |
SOF_SPEAKER_AMP_PRESENT |
SOF_RT1015_SPEAKER_AMP_PRESENT |
SOF_RT5682_SSP_AMP(1)),
},
You probably need a board-id quirk dedicated to CML, rather than
override the TGL one?
WARNING: multiple messages have this Message-ID (diff)
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Brent Lu <brent.lu@intel.com>, alsa-devel@alsa-project.org
Cc: 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>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>,
Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>,
Yong Zhi <yong.zhi@intel.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Dharageswari R <dharageswari.r@intel.com>,
Fred Oh <fred.oh@linux.intel.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ASoC: Intel: sof_rt5682: update quirk for cml boards
Date: Wed, 21 Oct 2020 08:56:57 -0500 [thread overview]
Message-ID: <9ae005e9-4cd9-31ef-56cb-504edc4cd503@linux.intel.com> (raw)
In-Reply-To: <20201021072646.7980-1-brent.lu@intel.com>
On 10/21/20 2:26 AM, Brent Lu wrote:
> The default quirk data of sof_rt5682 is for tgl platform. For cml
> platforms to reuse this driver, the flag SOF_RT5682_MCLK_24MHZ is
> necessary to setup codec asrc correctly.
>
> Signed-off-by: Brent Lu <brent.lu@intel.com>
> ---
> sound/soc/intel/boards/sof_rt5682.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
> index ddbb9fe7cc06..fa2c226a444a 100644
> --- a/sound/soc/intel/boards/sof_rt5682.c
> +++ b/sound/soc/intel/boards/sof_rt5682.c
> @@ -768,6 +768,11 @@ static int sof_audio_probe(struct platform_device *pdev)
> /* default number of HDMI DAI's */
> if (!hdmi_num)
> hdmi_num = 3;
> +
> + if (soc_intel_is_cml()) {
> + /* default quirk for sof_rt5682 is for tgl platform */
> + sof_rt5682_quirk |= SOF_RT5682_MCLK_24MHZ;
> + }
That setting is not wrong, but is it sufficient?
see e.g. what we set for existing platforms which need 24 Mhz in this
driver:
DMI quirks:
{
.callback = sof_rt5682_quirk_cb,
.matches = {
DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Hatch"),
},
.driver_data = (void *)(SOF_RT5682_MCLK_EN |
SOF_RT5682_MCLK_24MHZ |
SOF_RT5682_SSP_CODEC(0) |
SOF_SPEAKER_AMP_PRESENT |
SOF_RT5682_SSP_AMP(1)),
},
Board-id quirks:
{
.name = "jsl_rt5682_rt1015",
.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
SOF_RT5682_MCLK_24MHZ |
SOF_RT5682_SSP_CODEC(0) |
SOF_SPEAKER_AMP_PRESENT |
SOF_RT1015_SPEAKER_AMP_PRESENT |
SOF_RT5682_SSP_AMP(1)),
},
You probably need a board-id quirk dedicated to CML, rather than
override the TGL one?
next prev parent reply other threads:[~2020-10-21 13:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 7:26 [PATCH] ASoC: Intel: sof_rt5682: update quirk for cml boards Brent Lu
2020-10-21 7:26 ` Brent Lu
2020-10-21 13:56 ` Pierre-Louis Bossart [this message]
2020-10-21 13:56 ` Pierre-Louis Bossart
2020-10-21 14:20 ` Lu, Brent
2020-10-21 14:20 ` Lu, Brent
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=9ae005e9-4cd9-31ef-56cb-504edc4cd503@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=brent.lu@intel.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=dharageswari.r@intel.com \
--cc=fred.oh@linux.intel.com \
--cc=guennadi.liakhovetski@linux.intel.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sathyanarayana.nujella@intel.com \
--cc=tiwai@suse.com \
--cc=yang.jie@linux.intel.com \
--cc=yong.zhi@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 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.