From patchwork Fri Aug 4 08:56:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajye Huang X-Patchwork-Id: 710909 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 E16DBC001DB for ; Fri, 4 Aug 2023 08:58:46 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 39DF282A; Fri, 4 Aug 2023 10:57:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 39DF282A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691139524; bh=WIPZ4lzTOj0lP7CtCRlOAJoFZiPiIJE62daoicfGJok=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=Jzc9/RbjVY8FmuSqNWjMbFLat5tVP2PVim53uVUV317BmIEgM+ijTTZgIna5g/6p9 WtdOhjqicayvdcRdqegLkVGk9v6Z+JeQZbiXrcEP0fYQfL4U1ifOiBpvYuZMWsAAzp b25DWR0lCKybdI8nweLsyLQ3lYY5tvqJJY1fB0p8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5F261F8055C; Fri, 4 Aug 2023 10:57:15 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 1EB45F80552; Fri, 4 Aug 2023 10:57:15 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5C84CF80552; Fri, 4 Aug 2023 10:57:12 +0200 (CEST) Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 7E309F80548 for ; Fri, 4 Aug 2023 10:57:03 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7E309F80548 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=compal-corp-partner-google-com.20221208.gappssmtp.com header.i=@compal-corp-partner-google-com.20221208.gappssmtp.com header.a=rsa-sha256 header.s=20221208 header.b=Lv8SK3Cr Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-686ba97e4feso1694071b3a.0 for ; Fri, 04 Aug 2023 01:57:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=compal-corp-partner-google-com.20221208.gappssmtp.com; s=20221208; t=1691139422; x=1691744222; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bfMv4ulrmIsxurHo0m88dU36TfHYzKB8AsV7Hfju21Y=; b=Lv8SK3CrxJVAIRBf+a7XWNplyd3SEgDAJYv81JEA6n1sKQ47TdIAz2kAwrNXYClyRV iGEAAOvJXoHeg0chEjRffE2pNSltAG2eA1uQfhWe7PRKassPJlGXF5p3rnJl661LIyIp /G8s+ZzT8karCjzeC05LjOeN6RbQjHDum9PYMg80XyeCordsxud/c9F6nwbJ/qfdFbgu RYLNirhK51hqd/9jdozQVAaYnce8uRX7cc1NA5pCtar7PbgkrvLph7vTE4bCmIIh15x3 fYfEqk7xlcWn98IsCYthleMZsxwwyNOFKBa/V+zZytuiVs/PY9GffitpmXPaf+wcTQ43 fjZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691139422; x=1691744222; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bfMv4ulrmIsxurHo0m88dU36TfHYzKB8AsV7Hfju21Y=; b=Caadlv/Byn3t0ml0vIsbG2Yh12wX0FSoJk5v1m3u/dVtZ4dwbFzLnoW+5WVk7iE4Wr a3eBLFqfvWmYt6ZBbQmENH1hjHb73+H3MVvKJ1HhxJ9uksUeYT4Q93jVwC3BQIw7nZx8 8VSxPsK9e6rREoPQrY0DZ7o6/zqj7xy1lcVoxUyY+E0LE9qEVwhumA3BtqVnGJN01RTm /zMEFd+YgC3/pkd3qLlr6+NnpQ33mAKsdID644sN4iD0nC5qH57xisSot0tMSARc13xv K5Ho3PdcOuHNA5drUqLhxruY5aaSOiOtndF5vCFtPLrfueHIIBwvYzp7ZzqwFRrQtn1E 5X/w== X-Gm-Message-State: AOJu0YwvGJhZhqHrh35Fui2x6ynUZx10XdoajmBvIvF1Dk0i0oMtMdmv BiLtaTvxaXPUgGrA14diIm/57g== X-Google-Smtp-Source: AGHT+IFD2SL6z8bSyoN9DysfSz2pF4RUeiWz0Gr3RMYX9hNCXCWgkqUniCqXfM/vNDWgZiffnImgUw== X-Received: by 2002:a05:6a00:1ac7:b0:687:22ce:365f with SMTP id f7-20020a056a001ac700b0068722ce365fmr1410111pfv.29.1691139421487; Fri, 04 Aug 2023 01:57:01 -0700 (PDT) Received: from localhost.localdomain (36-226-4-196.dynamic-ip.hinet.net. [36.226.4.196]) by smtp.gmail.com with ESMTPSA id d8-20020aa78688000000b00686bbf5c573sm1126235pfo.119.2023.08.04.01.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Aug 2023 01:57:01 -0700 (PDT) From: Ajye Huang To: linux-kernel@vger.kernel.org Cc: Mark Brown , Pierre-Louis Bossart , Bard Liao , Peter Ujfalusi , Liam Girdwood , Akihiko Odaki , Yong Zhi , ye xingchen , "balamurugan . c" , Libin Yang , Ajye Huang , Jaroslav Kysela , Ranjani Sridharan , Cezary Rojewski , David Lin , Brent Lu , Takashi Iwai , Terry Cheong , Kai Vehmanen , Kuninori Morimoto , Gongjun Song , Arnd Bergmann , apoorv , alsa-devel@alsa-project.org Subject: [PATCH v1] ASoC: Intel: Add rpl_nau8318_8825 driver Date: Fri, 4 Aug 2023 16:56:48 +0800 Message-Id: <20230804085648.3721416-1-ajye_huang@compal.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Message-ID-Hash: XXGDKPUKD3HJZA2YA5AEEQOV3WOHODCH X-Message-ID-Hash: XXGDKPUKD3HJZA2YA5AEEQOV3WOHODCH X-MailFrom: ajye_huang@compal.corp-partner.google.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Boards were using this in older kernels before adl and rpl ids were split. Add this back to maintain support. Signed-off-by: Ajye Huang Acked-by: Pierre-Louis Bossart --- sound/soc/intel/boards/sof_nau8825.c | 10 ++++++++++ sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 12 ++++++++++++ 2 files changed, 22 insertions(+) diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c index 4fc6e1c6aef3..46b7ecf6f9f1 100644 --- a/sound/soc/intel/boards/sof_nau8825.c +++ b/sound/soc/intel/boards/sof_nau8825.c @@ -684,6 +684,16 @@ static const struct platform_device_id board_ids[] = { SOF_BT_OFFLOAD_SSP(2) | SOF_SSP_BT_OFFLOAD_PRESENT), }, + { + .name = "rpl_nau8318_8825", + .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_NAU8318_SPEAKER_AMP_PRESENT | + SOF_NAU8825_SSP_AMP(1) | + SOF_NAU8825_NUM_HDMIDEV(4) | + SOF_BT_OFFLOAD_SSP(2) | + SOF_SSP_BT_OFFLOAD_PRESENT), + }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c index 4eefdb2dd45c..1dd699181765 100644 --- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c @@ -351,6 +351,11 @@ static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = { .codecs = {"RTL1019"} }; +static const struct snd_soc_acpi_codecs rpl_nau8318_amp = { + .num_codecs = 1, + .codecs = {"NVTN2012"} +}; + struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { { .comp_ids = &rpl_rt5682_hp, @@ -373,6 +378,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = { .quirk_data = &rpl_max98373_amp, .sof_tplg_filename = "sof-rpl-max98373-nau8825.tplg", }, + { + .id = "10508825", + .drv_name = "rpl_nau8318_8825", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &rpl_nau8318_amp, + .sof_tplg_filename = "sof-rpl-nau8318-nau8825.tplg", + }, { .comp_ids = &rpl_rt5682_hp, .drv_name = "rpl_rt1019_rt5682",