From patchwork Tue Nov 8 04:27:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajye Huang X-Patchwork-Id: 13035850 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id F3CC8C4332F for ; Tue, 8 Nov 2022 04:28:48 +0000 (UTC) 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 E8D91820; Tue, 8 Nov 2022 05:27:56 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E8D91820 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1667881727; bh=zA/wqEM6aG6WUAM9qqUps9DalDOcTJ1w+81kjASH4LQ=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=MRftTqIy3w/yJ6+G91hJgjZpq1g4Jc1JE5CACwElSvNoj9rm6In5/Ei2ZAbXZWi8H XWoobkypl7VdgsfVzr8hc56hIdM70D1cQoVszu0IfGZL80Wzgo2ACV5daOQVqRcVue easIu8zgYevdzD+HCNev80A90MZTV+bApN7ME9yo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9DE3FF8024C; Tue, 8 Nov 2022 05:27:35 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 67ACCF800EC; Tue, 8 Nov 2022 05:27:33 +0100 (CET) Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 696B8F800EC for ; Tue, 8 Nov 2022 05:27:30 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 696B8F800EC Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=compal-corp-partner-google-com.20210112.gappssmtp.com header.i=@compal-corp-partner-google-com.20210112.gappssmtp.com header.b="pfeBoNA5" Received: by mail-pj1-x1031.google.com with SMTP id q1-20020a17090a750100b002139ec1e999so12321395pjk.1 for ; Mon, 07 Nov 2022 20:27:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=compal-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gSW9LI1yKHWyO/rnwkCvTR08ko1xObHpXEf8aeSwd9Q=; b=pfeBoNA5Bh6xN/MiR+jED1WBOTlZp2WlZBpGYpCIyfeCfZBbNQAwtOrh4AttchPHml RfZE/HxiOiSjCWyy0lxx/nnktJnXPeWQ/KHIYnmwOUDDoQnZalwDx4q/JW9wm0/53kox RYJcYvoUbGX0qjTiqxCiXxwbJ40K1vcXAuykzEmKPGiK2mqLRI3wt33jiuEECHOKTYEq 76EG5M4vnbW/r1WCoz3yHj7+Y/ENw0UJ6ZxZotxkpQxbBdo83UcmHQzDtTwkjQW/2FVw wzCdIhF9HmyKa02ohyFii5485LBRAWrdroLMFLCj1mkvcImFoWiD3m3/DxDetJon3KC6 d3yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gSW9LI1yKHWyO/rnwkCvTR08ko1xObHpXEf8aeSwd9Q=; b=EzMl4AiHy7y7qgkhD6fvZmRMdFn/7waMKmkEaPqjype7ocLi1A87Hd9488ss0MxG3p JARhs7J4B1NCq8j95AdCZxzV47R682NfHI5cLcfKsxN4bI2SBQ6L+Od+XvMn/DlXSnGj xQOJSvY2hrhbyMsOMFMfKPyoNX26fNCgXn+FgNsZPPBstrdBHKm/1vPRb3slScVDJfbq 3EiRYwyZF6WisUVWa+n+HwvDlq2kW70MJOanJ0e8/9AdFuRHgXoX0/Lc8bze6EHyhz1Y Novv0ldbYog+zsEavcH+RPwBI8rtJwTtAQir2MbuyewRTFDn/pxZK2jE/cG6a9oSHcfa TmNA== X-Gm-Message-State: ACrzQf2OohaUs9gq+RUjpSnCxSEQSVfWK7HRQE+sKndKh7YLewmrCWBT kJz88sD9J6d8K6Y6Rj5ZaKvdxA== X-Google-Smtp-Source: AMsMyM56PM3CirkkXYlb1KJ2cNUYQ4KhOBW2d6yCvBHctuckGdkycrrUSHFuzZha7WaB/bcG/Txxkg== X-Received: by 2002:a17:902:f651:b0:184:6925:d127 with SMTP id m17-20020a170902f65100b001846925d127mr53388547plg.140.1667881648182; Mon, 07 Nov 2022 20:27:28 -0800 (PST) Received: from localhost.localdomain (118-167-183-234.dynamic-ip.hinet.net. [118.167.183.234]) by smtp.gmail.com with ESMTPSA id j63-20020a625542000000b005627868e27esm5265945pfb.127.2022.11.07.20.27.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 20:27:27 -0800 (PST) From: Ajye Huang To: linux-kernel@vger.kernel.org Subject: [PATCH v1 1/2] ASoC: Intel: sof_rt5682: add support for ALC5682I-VD with amp rt1019p Date: Tue, 8 Nov 2022 12:27:15 +0800 Message-Id: <20221108042716.2930255-2-ajye_huang@compal.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221108042716.2930255-1-ajye_huang@compal.corp-partner.google.com> References: <20221108042716.2930255-1-ajye_huang@compal.corp-partner.google.com> MIME-Version: 1.0 Cc: Libin Yang , Cezary Rojewski , Ajye Huang , Kai Vehmanen , Peter Ujfalusi , Takashi Iwai , Pierre-Louis Bossart , Ranjani Sridharan , Liam Girdwood , alsa-devel@alsa-project.org, Mac Chiang , Mark Brown , Muralidhar Reddy , ye xingchen , David Lin , Bard Liao , Brent Lu , Vamshi Krishna , 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 patch adds the driver data for two rt1019 speaker amplifiers on SSP1 and ALC5682I-VD on SSP0 for ADL platform. Signed-off-by: Ajye Huang --- sound/soc/intel/boards/sof_rt5682.c | 3 +-- sound/soc/intel/common/soc-acpi-intel-adl-match.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 2358be208c1f..0e803c1c2b06 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -1092,10 +1092,9 @@ static const struct platform_device_id board_ids[] = { SOF_SSP_BT_OFFLOAD_PRESENT), }, { - .name = "adl_rt1019_rt5682s", + .name = "adl_rt1019_rt5682", .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | SOF_RT5682_SSP_CODEC(0) | - SOF_RT5682S_HEADPHONE_CODEC_PRESENT | SOF_SPEAKER_AMP_PRESENT | SOF_RT1019_SPEAKER_AMP_PRESENT | SOF_RT5682_SSP_AMP(1) | diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c index 9990d5502d26..3ca0a96d94de 100644 --- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c @@ -489,8 +489,8 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { .sof_tplg_filename = "sof-adl-max98360a-nau8825.tplg", }, { - .id = "RTL5682", - .drv_name = "adl_rt1019_rt5682s", + .comp_ids = &adl_rt5682_rt5682s_hp, + .drv_name = "adl_rt1019_rt5682", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &adl_rt1019p_amp, .sof_tplg_filename = "sof-adl-rt1019-rt5682.tplg", From patchwork Tue Nov 8 04:27:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajye Huang X-Patchwork-Id: 13035851 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2C2DEC433FE for ; Tue, 8 Nov 2022 04:29:16 +0000 (UTC) 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 27196843; Tue, 8 Nov 2022 05:28:24 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 27196843 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1667881754; bh=UJEGS5ECCs57pGynTcx/Ve7HdqEyHSaJYsCwYSEqWkU=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=tZQz9b+CfCakRz4xSciWPslN++tHpsvNi4Xmnu6Pn/lDj/pgLQqj9e6/F+8ETQKtq fsScHnjL5Wt3b7VgH5ZSX1R28C8p3ZL026Iby2OVRNW1ekso/Tsd7RSsSLz05pYL26 Kn9LFpVzAQ03zqCFdEEhwg/ef/TOz1XdjfuloP+I= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B3838F8028B; Tue, 8 Nov 2022 05:27:39 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 56274F8025D; Tue, 8 Nov 2022 05:27:37 +0100 (CET) Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id A3EAFF8025D for ; Tue, 8 Nov 2022 05:27:34 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A3EAFF8025D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=compal-corp-partner-google-com.20210112.gappssmtp.com header.i=@compal-corp-partner-google-com.20210112.gappssmtp.com header.b="b8vZnjuK" Received: by mail-pj1-x1030.google.com with SMTP id m6-20020a17090a5a4600b00212f8dffec9so12344846pji.0 for ; Mon, 07 Nov 2022 20:27:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=compal-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RIIGd8oP3sziwMfS5bjNdlZ83g03MLKO/gH68/ERIKg=; b=b8vZnjuKOV19audB3sn+ISPXH+awdfhfeJtmIytlnPM8pImaTJVYKLhIcjrVIvzS1Z wUGo6Vsv673ZH3Y73EfasjM3agz4k35iV5TnWXgZ7PazN7aSgcxTWtWe76YjKDSVXTUB gKnzifFd8Ophnyb2JGwApkeSmk84zZAVYBcrxfCX9IWhpjfOK6RB9VH5pjj/DXtaN5a5 82cBYM4KwX5yCXiHpBAK+fUg/yflgOO/EvAty35VlXPH3N05iKf+Lvdb+oR092R+I2oM 09mvwNYzNCZYLzGWjrV6W8AoN4R+6Cq2J1Ytr4jENHUjHXfEo4aU6GRSS3T2oYx8XIuG CJJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RIIGd8oP3sziwMfS5bjNdlZ83g03MLKO/gH68/ERIKg=; b=4Y5tzjrW5h13OqTRNCQzMa2v6N8QcDaYI9+mu59Lqhqr/WNnY4Fh2GFMNYVDdb9/UF Z3J4/v+p+3YB5SRfCyYU33NdHmW2WF7kFG02CgGG6+PrkuRrBGOUiRdrpTnhpzE/Kol1 /zsv2m4ofnJoA59RW1Rm8plXmJzAgOiG2Qr/Xh5qouxxUKDf3BPpiTLsDz98B6vUvtP6 RxR91j1npJupM7ZQzKwPbX4BPZvxnd4miIE+ewfKE/+mpaQCnLSo4KRxElokxFdXrt2A i8Q9WRh7laIRwOpYqotXitXDTr/vyMemYQRSfd+ZlR2Hdn1oFwBIuY/wU36ysLhKUjOQ lBwg== X-Gm-Message-State: ACrzQf00ZfJ9KjRWzdKDNYnCHBQpcdgOIZPtlguxIuLJ9PMrrjAZ+U3n SL+v6ixOThZb8guCHjxvNvLhcA== X-Google-Smtp-Source: AMsMyM4Zyf89FLUAoW4CNQByU6fT4GCrJPUd+YcTiXulxLCcqVtH4ZqdfuELixR3ErWYZ9AZnttmYw== X-Received: by 2002:a17:90a:fc94:b0:213:f73a:86a7 with SMTP id ci20-20020a17090afc9400b00213f73a86a7mr43210065pjb.144.1667881652413; Mon, 07 Nov 2022 20:27:32 -0800 (PST) Received: from localhost.localdomain (118-167-183-234.dynamic-ip.hinet.net. [118.167.183.234]) by smtp.gmail.com with ESMTPSA id j63-20020a625542000000b005627868e27esm5265945pfb.127.2022.11.07.20.27.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 20:27:32 -0800 (PST) From: Ajye Huang To: linux-kernel@vger.kernel.org Subject: [PATCH v1 2/2] ASoC: Intel: sof rt5682: remove the duplicate codes Date: Tue, 8 Nov 2022 12:27:16 +0800 Message-Id: <20221108042716.2930255-3-ajye_huang@compal.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221108042716.2930255-1-ajye_huang@compal.corp-partner.google.com> References: <20221108042716.2930255-1-ajye_huang@compal.corp-partner.google.com> MIME-Version: 1.0 Cc: Libin Yang , Cezary Rojewski , Ajye Huang , Kai Vehmanen , Peter Ujfalusi , Takashi Iwai , Pierre-Louis Bossart , Ranjani Sridharan , Liam Girdwood , alsa-devel@alsa-project.org, Mac Chiang , Mark Brown , Muralidhar Reddy , ye xingchen , David Lin , Bard Liao , Brent Lu , Vamshi Krishna , 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" Remove the redundant code to prevent user confuse. Signed-off-by: Ajye Huang --- sound/soc/intel/boards/sof_rt5682.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 0e803c1c2b06..4a2f91249b10 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -867,10 +867,6 @@ static int sof_audio_probe(struct platform_device *pdev) if (acpi_dev_present("RTL5682", NULL, -1)) sof_rt5682_quirk |= SOF_RT5682S_HEADPHONE_CODEC_PRESENT; - /* Detect the headset codec variant to support machines in DMI quirk */ - if (acpi_dev_present("RTL5682", NULL, -1)) - sof_rt5682_quirk |= SOF_RT5682S_HEADPHONE_CODEC_PRESENT; - if (soc_intel_is_byt() || soc_intel_is_cht()) { is_legacy_cpu = 1; dmic_be_num = 0;