From nobody Fri Dec 19 18:46:40 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95955C4332F for ; Tue, 8 Nov 2022 04:27:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232992AbiKHE1d (ORCPT ); Mon, 7 Nov 2022 23:27:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232919AbiKHE13 (ORCPT ); Mon, 7 Nov 2022 23:27:29 -0500 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC9F528732 for ; Mon, 7 Nov 2022 20:27:28 -0800 (PST) Received: by mail-pj1-x102a.google.com with SMTP id q1-20020a17090a750100b002139ec1e999so12321401pjk.1 for ; Mon, 07 Nov 2022 20:27:28 -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=g1l6Fo34UrPrtWyelqcv11DN6sMhAQBIZv7v82CYlamlv+7ljworblrSWO8F0nqlNx XPGKsZWokCS3SAWd4FqRjDJPOCqiSD2jpsj74HQrQn0ax1F/en+EOkg8O+0BNdFKAljh GYSllUonBa34cg/6vAkBSbRYQJdFf9vM46JeDfmOWdSVdXzXo8CKTJ1/4BfvkbMuisM+ 21Fo0pUX4sSpIjzUlOKFxLCdVzX75oDRx6Qtj5QTLdkk9lZq33MMZHRK83j0Hyxed37h 2UmPqpZ0W7dFBY68/GfUfr69nvVg3GGZg+NxWwnu35baFXb0sPhr316OUDGXMWW3c/25 mfpQ== X-Gm-Message-State: ACrzQf0H+ZNJpkl3YnQIcIRcsmxHsZkLbMbbhlMIJIH0I0bj1ERqchw/ G2/Kk+iiPabwbTYLk+ABkWEZG7l4KDkmRg== 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 Cc: Mark Brown , Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Jaroslav Kysela , Takashi Iwai , Brent Lu , Yong Zhi , Ajye Huang , Mac Chiang , ye xingchen , Vamshi Krishna , Muralidhar Reddy , Libin Yang , David Lin , alsa-devel@alsa-project.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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 Acked-by: Pierre-Louis Bossart --- 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/s= of_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[] = =3D { SOF_SSP_BT_OFFLOAD_PRESENT), }, { - .name =3D "adl_rt1019_rt5682s", + .name =3D "adl_rt1019_rt5682", .driver_data =3D (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_machine= s[] =3D { .sof_tplg_filename =3D "sof-adl-max98360a-nau8825.tplg", }, { - .id =3D "RTL5682", - .drv_name =3D "adl_rt1019_rt5682s", + .comp_ids =3D &adl_rt5682_rt5682s_hp, + .drv_name =3D "adl_rt1019_rt5682", .machine_quirk =3D snd_soc_acpi_codec_list, .quirk_data =3D &adl_rt1019p_amp, .sof_tplg_filename =3D "sof-adl-rt1019-rt5682.tplg", --=20 2.25.1 From nobody Fri Dec 19 18:46:40 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFF2EC433FE for ; Tue, 8 Nov 2022 04:27:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233073AbiKHE1l (ORCPT ); Mon, 7 Nov 2022 23:27:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233035AbiKHE1d (ORCPT ); Mon, 7 Nov 2022 23:27:33 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A3EC31DFE for ; Mon, 7 Nov 2022 20:27:33 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id c15-20020a17090a1d0f00b0021365864446so12296838pjd.4 for ; Mon, 07 Nov 2022 20:27:33 -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=ULCDLzD+p06GaNsGqLEjp3vjpuKeUp8gD04OgYea1rfYC5jbWt5+Q/NU+ERTAN7leG lcp4avWVR9Ea43aBP6HLsTx0jcxxDv6VJE8yIRK8Oz3h+Y3wxuUl0LcHExIQQ61hAMi5 zu49D2Eexjg/nN4l1uTjXhJwO2yIwbuEaCZJ1JhkbB4IigxWmNJdzncrgLklLas8T5um n3XPGG8jq37A+TVBUu5CanqbsPi9f9DM8NJ4dW6wXiH3ND3UD9p2ZzI92I2fX6gZ0gUx h3DANeQyeGYDbG6YSzsRJ5gsY491iddf4L90HL12vgsDDVP0Xh4RWkJkbue7z+YAjxwz 67qA== X-Gm-Message-State: ACrzQf0PHd3T/rURxHKTdasE26y6Y6046tGicZxmuVXD9LnMJYFdjkVe evMXNM5gKrI+qZBAP27In2LS9veG9OQ/dA== 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 Cc: Mark Brown , Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Jaroslav Kysela , Takashi Iwai , Brent Lu , Yong Zhi , Ajye Huang , Mac Chiang , ye xingchen , Vamshi Krishna , Muralidhar Reddy , Libin Yang , David Lin , alsa-devel@alsa-project.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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the redundant code to prevent user confuse. Signed-off-by: Ajye Huang Acked-by: Pierre-Louis Bossart --- 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/s= of_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 *pde= v) if (acpi_dev_present("RTL5682", NULL, -1)) sof_rt5682_quirk |=3D SOF_RT5682S_HEADPHONE_CODEC_PRESENT; =20 - /* Detect the headset codec variant to support machines in DMI quirk */ - if (acpi_dev_present("RTL5682", NULL, -1)) - sof_rt5682_quirk |=3D SOF_RT5682S_HEADPHONE_CODEC_PRESENT; - if (soc_intel_is_byt() || soc_intel_is_cht()) { is_legacy_cpu =3D 1; dmic_be_num =3D 0; --=20 2.25.1