From patchwork Fri Aug 12 11:48:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Hong X-Patchwork-Id: 597033 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 2A7B7C25B08 for ; Sat, 13 Aug 2022 06:09:11 +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 7F8F482C; Sat, 13 Aug 2022 08:08:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7F8F482C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1660370949; bh=8kFxKPy+FhfMBJxlE6LS8IQW/Usfq3pUflxzu5SJqcU=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=UCdiqo4w89/Q2SLwnsk4Z5teqVaXfs+RVLEE9tvGjOQhIBJeCnJSOi1CcSMQpT4be z7G4adwcR6u94JQkpfHBUGKnYZYLKAsaUiD4R9AEkuAHdxdsGT8fC4RHu6xuYVfIQk vx9rtbG41EfgiboXaz8EO3cvhn08Hw8tacQKgXg8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 15473F8014C; Sat, 13 Aug 2022 08:08:19 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CEF09F8026A; Fri, 12 Aug 2022 13:48:18 +0200 (CEST) Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) (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 41338F800AA for ; Fri, 12 Aug 2022 13:48:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 41338F800AA Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=quanta-corp-partner-google-com.20210112.gappssmtp.com header.i=@quanta-corp-partner-google-com.20210112.gappssmtp.com header.b="z7o6YDD1" Received: by mail-pj1-x102e.google.com with SMTP id q9-20020a17090a2dc900b001f58bcaca95so8107157pjm.3 for ; Fri, 12 Aug 2022 04:48:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quanta-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=1WPdo9M+Sx6XTbFXOZ/AtUfevOxtbqvZ35Od/wJosKk=; b=z7o6YDD1kXTK8o/DG7hkIWs3Z8hy7Yo6SjbLpSvIWfUN4EG+Ch1bZ3ZBpz6v7RBpud y36XNext6pDcS1uCMdAZqOzQxBc9V1FfdE7xmc6CIonPd1wxpgRn2GSZMY/IUbblmFZ4 6E+y+Z5m71GgwfbcNAB42ohiR5R5VoFRgJ8Nn1EPz1NOMpww7sJi8q182alt/1Ql2Ik1 VGOme+UfJy4285EOw2UvJkVBeOvhcGF4EOQucHIjQlQPxUtotN6BctQaVa6WdfLShiHD qmzgFgOGBzNT4F2yPczyhmDuye8ZkLRgeKYTLLiPYFyY3Y1EyRmPmuB2F9bj7C1UiBoK 2fvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=1WPdo9M+Sx6XTbFXOZ/AtUfevOxtbqvZ35Od/wJosKk=; b=PMX2RGrQZ0vLSL8CHjpJlFx5sHJ9a1jESK9gVzYQJ5rYvapbrlzhMrvlp7y3WLhwuW FxSBvGW2aqCp2fiJwd8iHaSb58OA+5xV+x7zNAG20evx+e4wepxSgHHJlkfPUpvCIOuj zpBX6s1MLh6T6b94ULsA+Sv2GoPjU/FA44CHOif/nQxh3sxQHqFN/z43H/reOx7Bpqbm q6joxQjWb109Eam129poWiaj8IXDCrKpC/yPuoNbZffeVLgkadRUYZ3KKUxrcdVewnYI 6hjCHzYwm1OXfApa1XQdhTlL/0ht7I8y6mZB4BQ8HIp8L1y5++xAMKCjQLq1cKg5bVdu QfHg== X-Gm-Message-State: ACgBeo1ceYcmAo3kOYcGl+8Wmn8Z9DHnYxj6Fd0cCLbsFDzp6mAOpatW AD/ppeTUtreBQ3bHoNF00B8wIA== X-Google-Smtp-Source: AA6agR7d1ezsS3nvkyhQ1bVhlUpxExz65NeFOzJabTp4+B2vJE68BRef/AbGYGLCukUi5Cc1rnwPrA== X-Received: by 2002:a17:90b:394:b0:1f5:90a1:acf0 with SMTP id ga20-20020a17090b039400b001f590a1acf0mr13458944pjb.40.1660304892505; Fri, 12 Aug 2022 04:48:12 -0700 (PDT) Received: from sean-biuld-server.itotolink.net (1-34-200-211.hinet-ip.hinet.net. [1.34.200.211]) by smtp.gmail.com with ESMTPSA id z6-20020a1709027e8600b0016d7afee272sm1499378pla.153.2022.08.12.04.48.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Aug 2022 04:48:12 -0700 (PDT) From: Sean Hong To: perex@perex.cz, tiwai@suse.com Subject: [PATCH] ASoC: Intel: sof_rt5682: Add support for jsl_rt5682_rt1019 Date: Fri, 12 Aug 2022 19:48:04 +0800 Message-Id: <20220812114804.550809-1-sean.hong@quanta.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Mailman-Approved-At: Sat, 13 Aug 2022 08:08:17 +0200 Cc: cezary.rojewski@intel.com, kai.vehmanen@linux.intel.com, Sean Hong , peter.ujfalusi@linux.intel.com, pierre-louis.bossart@linux.intel.com, ranjani.sridharan@linux.intel.com, liam.r.girdwood@linux.intel.com, broonie@kernel.org, alsa-devel@alsa-project.org, yung-chuan.liao@linux.intel.com, brent.lu@intel.com, linux-kernel@vger.kernel.org, yong.zhi@intel.com 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 rt5682s on SSP0 for ADL platform Signed-off-by: Sean Hong --- sound/soc/intel/boards/sof_rt5682.c | 9 +++++++++ sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 13 +++++++++++++ 2 files changed, 22 insertions(+) diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c index 045965312245b..3a840f3a9f5d2 100644 --- a/sound/soc/intel/boards/sof_rt5682.c +++ b/sound/soc/intel/boards/sof_rt5682.c @@ -1100,6 +1100,15 @@ static const struct platform_device_id board_ids[] = { SOF_RT5682_SSP_AMP(1) | SOF_RT5682_NUM_HDMIDEV(4)), }, + { + .name = "jsl_rt5682_rt1019", + .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN | + SOF_RT5682_MCLK_24MHZ | + SOF_RT5682_SSP_CODEC(0) | + SOF_SPEAKER_AMP_PRESENT | + SOF_RT1019_SPEAKER_AMP_PRESENT | + SOF_RT5682_SSP_AMP(1)), + }, { } }; MODULE_DEVICE_TABLE(platform, board_ids); diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c index b95c4b2cda947..139d2468f5f70 100644 --- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c @@ -29,6 +29,11 @@ static const struct snd_soc_acpi_codecs rt1015p_spk = { .codecs = {"RTL1015"} }; +static struct snd_soc_acpi_codecs rt1019p_spk = { + .num_codecs = 1, + .codecs = {"RTL1019"} +} + static const struct snd_soc_acpi_codecs mx98360a_spk = { .num_codecs = 1, .codecs = {"MX98360A"} @@ -78,6 +83,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { .quirk_data = &mx98360a_spk, .sof_tplg_filename = "sof-jsl-rt5682-mx98360a.tplg", }, + { + .comp_ids = &rt5682_rt5682s_hp, + .drv_name = "jsl_rt5682_rt1019", + .sof_fw_filename = "sof-jsl.ri", + .machine_quirk = snd_soc_acpi_codec_list, + .quirk_data = &rt1019p_spk, + .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg", + }, { .id = "10134242", .drv_name = "jsl_cs4242_mx98360a",