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)), + },