All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: linux-sound@vger.kernel.org
Cc: alsa-devel@alsa-project.org, tiwai@suse.de, broonie@kernel.org,
	Brent Lu <brent.lu@intel.com>,
	Bard Liao <yung-chuan.liao@linux.intel.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH 18/18] ASoC: Intel: sof_cs42l42: add mtl_cs42l42_def for mtl boards
Date: Wed, 27 Mar 2024 11:24:08 -0500	[thread overview]
Message-ID: <20240327162408.63953-19-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20240327162408.63953-1-pierre-louis.bossart@linux.intel.com>

From: Brent Lu <brent.lu@intel.com>

Add the board config mtl_cs42l42_def to cs42l42 machine driver for all
mtl boards using default SSP port allocation (headphone codec on SSP2,
speaker amplifiers on SSP0, and BT offload on SSP1).

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Brent Lu <brent.lu@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/intel/boards/sof_cs42l42.c              | 7 +++++++
 sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/sound/soc/intel/boards/sof_cs42l42.c b/sound/soc/intel/boards/sof_cs42l42.c
index 3fc76184bdb3..f4fee2ee0d63 100644
--- a/sound/soc/intel/boards/sof_cs42l42.c
+++ b/sound/soc/intel/boards/sof_cs42l42.c
@@ -278,6 +278,13 @@ static const struct platform_device_id board_ids[] = {
 					SOF_BT_OFFLOAD_PRESENT |
 					SOF_SSP_PORT_BT_OFFLOAD(2)),
 	},
+	{
+		.name = "mtl_cs42l42_def",
+		.driver_data = (kernel_ulong_t)(SOF_SSP_PORT_CODEC(2) |
+					SOF_SSP_PORT_AMP(0) |
+					SOF_BT_OFFLOAD_PRESENT |
+					SOF_SSP_PORT_BT_OFFLOAD(1)),
+	},
 	{ }
 };
 MODULE_DEVICE_TABLE(platform, board_ids);
diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
index 7f422848a3ba..75935b454e5d 100644
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -69,6 +69,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = {
 	/* place boards for each headphone codec: sof driver will complete the
 	 * tplg name and machine driver will detect the amp type
 	 */
+	{
+		.id = CS42L42_ACPI_HID,
+		.drv_name = "mtl_cs42l42_def",
+		.sof_tplg_filename = "sof-mtl", /* the tplg suffix is added at run time */
+		.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |
+					SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,
+	},
 	{
 		.id = NAU8825_ACPI_HID,
 		.drv_name = "mtl_nau8825_def",
-- 
2.40.1


  parent reply	other threads:[~2024-03-27 16:24 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-27 16:23 [PATCH 00/18] ASoC: Intel: boards: updates for 6.10 - part3 Pierre-Louis Bossart
2024-03-27 16:23 ` [PATCH 01/18] ASoC: Intel: ssp-common: relocate source file Pierre-Louis Bossart
2024-03-27 16:23 ` [PATCH 02/18] ASoC: Intel: ssp-common: relocate header file Pierre-Louis Bossart
2024-03-27 16:23 ` [PATCH 03/18] ASoC: Intel: ssp-common: naming convention change Pierre-Louis Bossart
2024-03-27 16:23 ` [PATCH 04/18] ASoC: Intel: ssp-common: module name change Pierre-Louis Bossart
2024-03-27 16:23 ` [PATCH 05/18] ASoC: Intel: ssp-common: delete module Pierre-Louis Bossart
2024-03-27 16:23 ` [PATCH 06/18] ASoC: Intel: ssp-common: get codec tplg suffix function Pierre-Louis Bossart
2024-03-27 16:23 ` [PATCH 07/18] ASoC: SOF: Intel: support tplg suffix detection Pierre-Louis Bossart
2024-03-27 16:23 ` [PATCH 08/18] ASoC: Intel: sof_nau8825: mach cleanup for adl boards Pierre-Louis Bossart
2024-03-27 16:23 ` [PATCH 09/18] ASoC: Intel: sof_nau8825: mach cleanup for rpl boards Pierre-Louis Bossart
2024-03-27 16:24 ` [PATCH 10/18] ASoC: Intel: sof_nau8825: add mtl_nau8825_def for mtl boards Pierre-Louis Bossart
2024-03-27 16:24 ` [PATCH 11/18] ASoC: Intel: sof_rt5682: mach cleanup for tgl boards Pierre-Louis Bossart
2024-03-27 16:24 ` [PATCH 12/18] ASoC: Intel: sof_rt5682: mach cleanup for adl boards Pierre-Louis Bossart
2024-03-27 16:24 ` [PATCH 13/18] ASoC: Intel: sof_rt5682: mach cleanup for rpl boards Pierre-Louis Bossart
2024-03-27 16:24 ` [PATCH 14/18] ASoC: Intel: sof_rt5682: mach cleanup for mtl boards Pierre-Louis Bossart
2024-03-27 16:24 ` [PATCH 15/18] ASoC: Intel: sof_cs42l42: board id cleanup for adl boards Pierre-Louis Bossart
2024-03-27 16:24 ` [PATCH 16/18] ASoC: Intel: sof_cs42l42: mach " Pierre-Louis Bossart
2024-03-27 16:24 ` [PATCH 17/18] ASoC: Intel: sof_cs42l42: add rpl_cs42l42_def for rpl boards Pierre-Louis Bossart
2024-03-27 16:24 ` Pierre-Louis Bossart [this message]
2024-03-29 12:33 ` [PATCH 00/18] ASoC: Intel: boards: updates for 6.10 - part3 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=20240327162408.63953-19-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=brent.lu@intel.com \
    --cc=broonie@kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=tiwai@suse.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.