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>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Jason Yan <yanaijie@huawei.com>,
linux-kernel@vger.kernel.org, Takashi Iwai <tiwai@suse.com>,
Jie Yang <yang.jie@linux.intel.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>,
Rander Wang <rander.wang@intel.com>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Yong Zhi <yong.zhi@intel.com>
Subject: Re: [PATCH 2/2] ASoC: intel: sof_rt5682: Add quirk for Dooly
Date: Fri, 30 Oct 2020 10:32:28 -0500 [thread overview]
Message-ID: <c83b3f20-2afd-12da-c349-31f35f8f6aa5@linux.intel.com> (raw)
In-Reply-To: <20201030063654.25877-3-brent.lu@intel.com>
On 10/30/20 1:36 AM, Brent Lu wrote:
> This DMI product family string of this board is "Google_Hatch" so the
> DMI quirk will take place. However, this board is using rt1015 speaker
> amp instead of max98357a specified in the quirk. Therefore, we need an
> new DMI quirk for this board.
Do you actually need a DMI quirk for this platform?
the .driver_data below uses the exact same settings as what you would
use with the generic solution based on ACPI IDs, see below.
Wondering if patch1 would be enough?
>
> Signed-off-by: Brent Lu <brent.lu@intel.com>
> ---
> sound/soc/intel/boards/sof_rt5682.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
> index 7701957e0eb7..dfcdf6d4b6c8 100644
> --- a/sound/soc/intel/boards/sof_rt5682.c
> +++ b/sound/soc/intel/boards/sof_rt5682.c
> @@ -100,6 +100,20 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
> SOF_RT5682_MCLK_24MHZ |
> SOF_RT5682_SSP_CODEC(1)),
> },
> + {
> + .callback = sof_rt5682_quirk_cb,
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "HP"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Dooly"),
> + },
> + .driver_data = (void *)(SOF_RT5682_MCLK_EN |
> + SOF_RT5682_MCLK_24MHZ |
> + SOF_RT5682_SSP_CODEC(0) |
> + SOF_SPEAKER_AMP_PRESENT |
> + SOF_RT1015_SPEAKER_AMP_PRESENT |
> + SOF_RT1015_SPEAKER_AMP_100FS |
> + SOF_RT5682_SSP_AMP(1)),
> + },
is this really needed? it's the same as the .driver_data below:
@@ -875,6 +901,16 @@ static const struct platform_device_id board_ids[] = {
SOF_MAX98360A_SPEAKER_AMP_PRESENT |
SOF_RT5682_SSP_AMP(1)),
},
+ {
+ .name = "cml_rt1015_rt5682",
+ .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_RT1015_SPEAKER_AMP_100FS |
+ SOF_RT5682_SSP_AMP(1)),
+ },
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: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>,
Cezary Rojewski <cezary.rojewski@intel.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Jason Yan <yanaijie@huawei.com>,
Jie Yang <yang.jie@linux.intel.com>,
linux-kernel@vger.kernel.org, Takashi Iwai <tiwai@suse.com>,
Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Mark Brown <broonie@kernel.org>,
Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>,
Rander Wang <rander.wang@intel.com>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Fred Oh <fred.oh@linux.intel.com>, Yong Zhi <yong.zhi@intel.com>
Subject: Re: [PATCH 2/2] ASoC: intel: sof_rt5682: Add quirk for Dooly
Date: Fri, 30 Oct 2020 10:32:28 -0500 [thread overview]
Message-ID: <c83b3f20-2afd-12da-c349-31f35f8f6aa5@linux.intel.com> (raw)
In-Reply-To: <20201030063654.25877-3-brent.lu@intel.com>
On 10/30/20 1:36 AM, Brent Lu wrote:
> This DMI product family string of this board is "Google_Hatch" so the
> DMI quirk will take place. However, this board is using rt1015 speaker
> amp instead of max98357a specified in the quirk. Therefore, we need an
> new DMI quirk for this board.
Do you actually need a DMI quirk for this platform?
the .driver_data below uses the exact same settings as what you would
use with the generic solution based on ACPI IDs, see below.
Wondering if patch1 would be enough?
>
> Signed-off-by: Brent Lu <brent.lu@intel.com>
> ---
> sound/soc/intel/boards/sof_rt5682.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
> index 7701957e0eb7..dfcdf6d4b6c8 100644
> --- a/sound/soc/intel/boards/sof_rt5682.c
> +++ b/sound/soc/intel/boards/sof_rt5682.c
> @@ -100,6 +100,20 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
> SOF_RT5682_MCLK_24MHZ |
> SOF_RT5682_SSP_CODEC(1)),
> },
> + {
> + .callback = sof_rt5682_quirk_cb,
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "HP"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Dooly"),
> + },
> + .driver_data = (void *)(SOF_RT5682_MCLK_EN |
> + SOF_RT5682_MCLK_24MHZ |
> + SOF_RT5682_SSP_CODEC(0) |
> + SOF_SPEAKER_AMP_PRESENT |
> + SOF_RT1015_SPEAKER_AMP_PRESENT |
> + SOF_RT1015_SPEAKER_AMP_100FS |
> + SOF_RT5682_SSP_AMP(1)),
> + },
is this really needed? it's the same as the .driver_data below:
@@ -875,6 +901,16 @@ static const struct platform_device_id board_ids[] = {
SOF_MAX98360A_SPEAKER_AMP_PRESENT |
SOF_RT5682_SSP_AMP(1)),
},
+ {
+ .name = "cml_rt1015_rt5682",
+ .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_RT1015_SPEAKER_AMP_100FS |
+ SOF_RT5682_SSP_AMP(1)),
+ },
next prev parent reply other threads:[~2020-10-30 16:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 6:36 [PATCH 0/2] Add rt1015 support to CML boards Brent Lu
2020-10-30 6:36 ` Brent Lu
2020-10-30 6:36 ` [PATCH 1/2] ASoC: intel: sof_rt5682: Add support for cml_rt1015_rt5682 Brent Lu
2020-10-30 6:36 ` Brent Lu
2020-10-30 6:36 ` [PATCH 2/2] ASoC: intel: sof_rt5682: Add quirk for Dooly Brent Lu
2020-10-30 6:36 ` Brent Lu
2020-10-30 15:32 ` Pierre-Louis Bossart [this message]
2020-10-30 15:32 ` Pierre-Louis Bossart
2020-10-30 16:44 ` Lu, Brent
2020-10-30 16:44 ` Lu, Brent
2020-10-30 16:54 ` Pierre-Louis Bossart
2020-10-30 16:54 ` Pierre-Louis Bossart
2020-10-30 17:01 ` Mark Brown
2020-10-30 17:01 ` Mark Brown
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=c83b3f20-2afd-12da-c349-31f35f8f6aa5@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=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=rander.wang@intel.com \
--cc=sathyanarayana.nujella@intel.com \
--cc=tiwai@suse.com \
--cc=yanaijie@huawei.com \
--cc=yang.jie@linux.intel.com \
--cc=yong.zhi@intel.com \
--cc=yung-chuan.liao@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 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.