From: Brent Lu <brent.lu@intel.com>
To: alsa-devel@alsa-project.org
Cc: Libin Yang <libin.yang@intel.com>,
Cezary Rojewski <cezary.rojewski@intel.com>,
Ajye Huang <ajye_huang@compal.corp-partner.google.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Rander Wang <rander.wang@intel.com>,
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>,
Takashi Iwai <tiwai@suse.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Gongjun Song <gongjun.song@intel.com>,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Mac Chiang <mac.chiang@intel.com>,
Mark Brown <broonie@kernel.org>,
Muralidhar Reddy <muralidhar.reddy@intel.com>,
Akihiko Odaki <akihiko.odaki@gmail.com>,
David Lin <CTLIN0@nuvoton.com>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Brent Lu <brent.lu@intel.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v8 2/2] ASoC: Intel: sof_cs42l42: add adl_mx98360a_cs4242 board config
Date: Fri, 8 Jul 2022 19:00:30 +0800 [thread overview]
Message-ID: <20220708110030.658468-3-brent.lu@intel.com> (raw)
In-Reply-To: <20220708110030.658468-1-brent.lu@intel.com>
This patch adds driver data for adl_mx98360a_cs4242 which supports
two max98360a speaker amplifiers on SSP1 and cs42l42 headphone codec
on SSP0 running on ADL platform.
Signed-off-by: Brent Lu <brent.lu@intel.com>
---
sound/soc/intel/boards/sof_cs42l42.c | 11 +++++++++++
sound/soc/intel/common/soc-acpi-intel-adl-match.c | 7 +++++++
2 files changed, 18 insertions(+)
diff --git a/sound/soc/intel/boards/sof_cs42l42.c b/sound/soc/intel/boards/sof_cs42l42.c
index 3d53bb420c66..85ffd065895d 100644
--- a/sound/soc/intel/boards/sof_cs42l42.c
+++ b/sound/soc/intel/boards/sof_cs42l42.c
@@ -700,6 +700,17 @@ static const struct platform_device_id board_ids[] = {
SOF_CS42L42_SSP_AMP(1)) |
SOF_CS42L42_DAILINK(LINK_HP, LINK_DMIC, LINK_HDMI, LINK_SPK, LINK_NONE),
},
+ {
+ .name = "adl_mx98360a_cs4242",
+ .driver_data = (kernel_ulong_t)(SOF_CS42L42_SSP_CODEC(0) |
+ SOF_SPEAKER_AMP_PRESENT |
+ SOF_MAX98360A_SPEAKER_AMP_PRESENT |
+ SOF_CS42L42_SSP_AMP(1) |
+ SOF_CS42L42_NUM_HDMIDEV(4) |
+ SOF_BT_OFFLOAD_PRESENT |
+ SOF_CS42L42_SSP_BT(2) |
+ SOF_CS42L42_DAILINK(LINK_HP, LINK_DMIC, LINK_HDMI, LINK_SPK, LINK_BT)),
+ },
{ }
};
MODULE_DEVICE_TABLE(platform, board_ids);
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 c1385161cdc8..fea087d3fa15 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -479,6 +479,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
.drv_name = "adl_rt5682",
.sof_tplg_filename = "sof-adl-rt5682.tplg",
},
+ {
+ .id = "10134242",
+ .drv_name = "adl_mx98360a_cs4242",
+ .machine_quirk = snd_soc_acpi_codec_list,
+ .quirk_data = &adl_max98360a_amp,
+ .sof_tplg_filename = "sof-adl-max98360a-cs42l42.tplg",
+ },
/* place amp-only boards in the end of table */
{
.id = "CSC3541",
--
2.25.1
next prev parent reply other threads:[~2022-07-08 11:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-08 11:00 [PATCH v8 0/2] ASoC: Intel: sof_cs42l42: adding support for ADL configuration and BT offload Brent Lu
2022-07-08 11:00 ` [PATCH v8 1/2] ASoC: Intel: sof_cs42l42: support BT offload audio Brent Lu
2022-07-08 11:00 ` Brent Lu [this message]
2022-07-08 14:11 ` [PATCH v8 0/2] ASoC: Intel: sof_cs42l42: adding support for ADL configuration and BT offload Pierre-Louis Bossart
2022-07-08 20:47 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220708110030.658468-3-brent.lu@intel.com \
--to=brent.lu@intel.com \
--cc=CTLIN0@nuvoton.com \
--cc=ajye_huang@compal.corp-partner.google.com \
--cc=akihiko.odaki@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=gongjun.song@intel.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=libin.yang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mac.chiang@intel.com \
--cc=muralidhar.reddy@intel.com \
--cc=peter.ujfalusi@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rander.wang@intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=tiwai@suse.com \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox