From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFCD8C00A89 for ; Fri, 30 Oct 2020 16:21:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F3D520719 for ; Fri, 30 Oct 2020 16:21:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726992AbgJ3QU7 (ORCPT ); Fri, 30 Oct 2020 12:20:59 -0400 Received: from mga02.intel.com ([134.134.136.20]:56316 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726063AbgJ3QU6 (ORCPT ); Fri, 30 Oct 2020 12:20:58 -0400 IronPort-SDR: C3FH/ReVIX6HzV+796IgyQvAZZqWCRWbeb/DP4MRgixouOt0IOdlAFGEvMunRopMOgfcts5dRu CSn3Uq9Hwycw== X-IronPort-AV: E=McAfee;i="6000,8403,9790"; a="155605450" X-IronPort-AV: E=Sophos;i="5.77,433,1596524400"; d="scan'208";a="155605450" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2020 09:18:55 -0700 IronPort-SDR: 4V+oBVfVfMxQcsh23dOEWukp6Eehl2L0agOFjNOCS8wxqVHaAjV6Rr+CStfFRW0L1/wYRGKgIQ l4l0BWoQD5SQ== X-IronPort-AV: E=Sophos;i="5.77,433,1596524400"; d="scan'208";a="469569446" Received: from rdchavez-mobl2.amr.corp.intel.com (HELO [10.212.91.180]) ([10.212.91.180]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2020 09:18:54 -0700 Subject: Re: [PATCH 2/2] ASoC: intel: sof_rt5682: Add quirk for Dooly To: Brent Lu , alsa-devel@alsa-project.org Cc: Guennadi Liakhovetski , Cezary Rojewski , Kuninori Morimoto , Kai Vehmanen , Jason Yan , linux-kernel@vger.kernel.org, Takashi Iwai , Jie Yang , Liam Girdwood , Mark Brown , Sathyanarayana Nujella , Fred Oh , Rander Wang , Bard Liao , Yong Zhi References: <20201030063654.25877-1-brent.lu@intel.com> <20201030063654.25877-3-brent.lu@intel.com> From: Pierre-Louis Bossart Message-ID: Date: Fri, 30 Oct 2020 10:32:28 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201030063654.25877-3-brent.lu@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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)), + },