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=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 0ED11C00A89 for ; Fri, 30 Oct 2020 06:48:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB83322203 for ; Fri, 30 Oct 2020 06:48:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725836AbgJ3GsO (ORCPT ); Fri, 30 Oct 2020 02:48:14 -0400 Received: from mga03.intel.com ([134.134.136.65]:2670 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725893AbgJ3GsM (ORCPT ); Fri, 30 Oct 2020 02:48:12 -0400 IronPort-SDR: PLQ6DnqdEIenxjZ+BzPS5DZWmFHLcV5cfC4X3JcUsW7EB1JB2dUjoNlKRtm3d34NOUwsdaRwDe 1DXb7bPuBgog== X-IronPort-AV: E=McAfee;i="6000,8403,9789"; a="168663834" X-IronPort-AV: E=Sophos;i="5.77,432,1596524400"; d="scan'208";a="168663834" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2020 23:48:11 -0700 IronPort-SDR: Qq9gARc4X2zMgLQ0L96Y7TirGTSTIOtacl3mchzb6Zf8ea2f1jMuXyQkmfmmGCwPskjVa38Pwo PecHiCIonBsw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,432,1596524400"; d="scan'208";a="361760847" Received: from brentlu-desk0.itwn.intel.com ([10.5.253.11]) by FMSMGA003.fm.intel.com with ESMTP; 29 Oct 2020 23:48:08 -0700 From: Brent Lu To: alsa-devel@alsa-project.org Cc: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Jie Yang , Mark Brown , Jaroslav Kysela , Takashi Iwai , Sathyanarayana Nujella , Guennadi Liakhovetski , Kai Vehmanen , Yong Zhi , Kuninori Morimoto , Brent Lu , Fred Oh , Rander Wang , Bard Liao , Jason Yan , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ASoC: intel: sof_rt5682: Add quirk for Dooly Date: Fri, 30 Oct 2020 14:36:54 +0800 Message-Id: <20201030063654.25877-3-brent.lu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201030063654.25877-1-brent.lu@intel.com> References: <20201030063654.25877-1-brent.lu@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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)), + }, { .callback = sof_rt5682_quirk_cb, .matches = { -- 2.17.1 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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 5725AC56201 for ; Fri, 30 Oct 2020 06:50:10 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 84F2822202 for ; Fri, 30 Oct 2020 06:50:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="W+g8gjcW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 84F2822202 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id DE46C15F9; Fri, 30 Oct 2020 07:49:17 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DE46C15F9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1604040608; bh=9s78C3WTsH7Lp9NPGJtt/tKUOme5oARiTKKPAxXnSSg=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=W+g8gjcWw5u0VMrz9nkMN6qIp3Z5gDf5NNqf7uB/OTXhk6OdzzH/Cop3e2ZHpe0SG KNRJ7Cnzq71OSp/xjkOufi6rrSVKPhb0bLMSULWCyguTBBCb82rMkvZ7AZIA+HFdR2 2yTeFv/u7n9brwMjrFPR9WSg2DFpF+6iTUPERIT4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 8D447F8027C; Fri, 30 Oct 2020 07:48:26 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 559C3F8026D; Fri, 30 Oct 2020 07:48:23 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 52E57F80212 for ; Fri, 30 Oct 2020 07:48:15 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 52E57F80212 IronPort-SDR: 5u7b5agwilRp3yX0OOIQkfQndsYZ/VdEy1tqxXPsufr5ZTxN5cKuscMWnySTgNXR2MgciVOVKu OFWTKTSFcTCg== X-IronPort-AV: E=McAfee;i="6000,8403,9789"; a="168697920" X-IronPort-AV: E=Sophos;i="5.77,432,1596524400"; d="scan'208";a="168697920" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2020 23:48:11 -0700 IronPort-SDR: Qq9gARc4X2zMgLQ0L96Y7TirGTSTIOtacl3mchzb6Zf8ea2f1jMuXyQkmfmmGCwPskjVa38Pwo PecHiCIonBsw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,432,1596524400"; d="scan'208";a="361760847" Received: from brentlu-desk0.itwn.intel.com ([10.5.253.11]) by FMSMGA003.fm.intel.com with ESMTP; 29 Oct 2020 23:48:08 -0700 From: Brent Lu To: alsa-devel@alsa-project.org Subject: [PATCH 2/2] ASoC: intel: sof_rt5682: Add quirk for Dooly Date: Fri, 30 Oct 2020 14:36:54 +0800 Message-Id: <20201030063654.25877-3-brent.lu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201030063654.25877-1-brent.lu@intel.com> References: <20201030063654.25877-1-brent.lu@intel.com> Cc: Guennadi Liakhovetski , Cezary Rojewski , Kuninori Morimoto , Kai Vehmanen , Jason Yan , linux-kernel@vger.kernel.org, Takashi Iwai , Jie Yang , Pierre-Louis Bossart , Liam Girdwood , Mark Brown , Sathyanarayana Nujella , Fred Oh , Rander Wang , Bard Liao , Brent Lu , Yong Zhi X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" 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. 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)), + }, { .callback = sof_rt5682_quirk_cb, .matches = { -- 2.17.1