* [PATCH] ASoC: Intel: sof_rt5682: update quirk for cml boards
@ 2020-10-21 7:26 ` Brent Lu
0 siblings, 0 replies; 6+ messages in thread
From: Brent Lu @ 2020-10-21 7:26 UTC (permalink / raw)
To: alsa-devel
Cc: Cezary Rojewski, Pierre-Louis Bossart, Liam Girdwood, Jie Yang,
Mark Brown, Jaroslav Kysela, Takashi Iwai, Kai Vehmanen,
Sathyanarayana Nujella, Guennadi Liakhovetski, Yong Zhi,
Kuninori Morimoto, Dharageswari R, Fred Oh, linux-kernel,
Brent Lu
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;
+ }
}
/* need to get main clock from pmc */
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ASoC: Intel: sof_rt5682: update quirk for cml boards
@ 2020-10-21 7:26 ` Brent Lu
0 siblings, 0 replies; 6+ messages in thread
From: Brent Lu @ 2020-10-21 7:26 UTC (permalink / raw)
To: alsa-devel
Cc: Guennadi Liakhovetski, Cezary Rojewski, Dharageswari R,
Kuninori Morimoto, Kai Vehmanen, linux-kernel, Takashi Iwai,
Jie Yang, Pierre-Louis Bossart, Liam Girdwood, Mark Brown,
Sathyanarayana Nujella, Fred Oh, Brent Lu, Yong Zhi
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;
+ }
}
/* need to get main clock from pmc */
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: Intel: sof_rt5682: update quirk for cml boards
2020-10-21 7:26 ` Brent Lu
@ 2020-10-21 13:56 ` Pierre-Louis Bossart
-1 siblings, 0 replies; 6+ messages in thread
From: Pierre-Louis Bossart @ 2020-10-21 13:56 UTC (permalink / raw)
To: Brent Lu, alsa-devel
Cc: Cezary Rojewski, Liam Girdwood, Jie Yang, Mark Brown,
Jaroslav Kysela, Takashi Iwai, Kai Vehmanen,
Sathyanarayana Nujella, Guennadi Liakhovetski, Yong Zhi,
Kuninori Morimoto, Dharageswari R, Fred Oh, linux-kernel
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?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: Intel: sof_rt5682: update quirk for cml boards
@ 2020-10-21 13:56 ` Pierre-Louis Bossart
0 siblings, 0 replies; 6+ messages in thread
From: Pierre-Louis Bossart @ 2020-10-21 13:56 UTC (permalink / raw)
To: Brent Lu, alsa-devel
Cc: Guennadi Liakhovetski, Cezary Rojewski, Dharageswari R,
Kuninori Morimoto, Kai Vehmanen, linux-kernel, Jie Yang,
Takashi Iwai, Liam Girdwood, Mark Brown, Sathyanarayana Nujella,
Fred Oh, Yong Zhi
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?
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] ASoC: Intel: sof_rt5682: update quirk for cml boards
2020-10-21 13:56 ` Pierre-Louis Bossart
@ 2020-10-21 14:20 ` Lu, Brent
-1 siblings, 0 replies; 6+ messages in thread
From: Lu, Brent @ 2020-10-21 14:20 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: Rojewski, Cezary, Liam Girdwood, Jie Yang, Mark Brown,
Jaroslav Kysela, Takashi Iwai, Kai Vehmanen, Nujella,
Sathyanarayana, Guennadi Liakhovetski, Zhi, Yong,
Kuninori Morimoto, R, Dharageswari, Fred Oh, linux-kernel
>
> 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)),
> },
>
Hi Pierre,
CML chromebox is using DMI quirk so we don't need this patch. Sorry
for not noticing it.
Handle 0x0001, DMI type 1, 27 bytes
System Information
Manufacturer: Google
Product Name: Duffy
Version: rev3
Serial Number: 123456789
UUID: Not Settable
Wake-up Type: Reserved
SKU Number: sku33554439
Family: Google_Hatch
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] ASoC: Intel: sof_rt5682: update quirk for cml boards
@ 2020-10-21 14:20 ` Lu, Brent
0 siblings, 0 replies; 6+ messages in thread
From: Lu, Brent @ 2020-10-21 14:20 UTC (permalink / raw)
To: Pierre-Louis Bossart, alsa-devel
Cc: Guennadi Liakhovetski, Rojewski, Cezary, R, Dharageswari,
Kuninori Morimoto, Kai Vehmanen, linux-kernel, Jie Yang,
Takashi Iwai, Liam Girdwood, Mark Brown, Nujella, Sathyanarayana,
Fred Oh, Zhi, Yong
>
> 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)),
> },
>
Hi Pierre,
CML chromebox is using DMI quirk so we don't need this patch. Sorry
for not noticing it.
Handle 0x0001, DMI type 1, 27 bytes
System Information
Manufacturer: Google
Product Name: Duffy
Version: rev3
Serial Number: 123456789
UUID: Not Settable
Wake-up Type: Reserved
SKU Number: sku33554439
Family: Google_Hatch
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-21 14:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2020-10-21 13:56 ` Pierre-Louis Bossart
2020-10-21 14:20 ` Lu, Brent
2020-10-21 14:20 ` Lu, Brent
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.