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 11/23] ASoC: Intel: sof_da7219: add glk_da7219_def for glk boards
Date: Fri, 26 Apr 2024 10:25:17 -0500 [thread overview]
Message-ID: <20240426152529.38345-12-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20240426152529.38345-1-pierre-louis.bossart@linux.intel.com>
From: Brent Lu <brent.lu@intel.com>
Add the board config glk_da7219_def to da7219 machine driver for all
glk boards using default SSP port allocation (headphone codec on SSP2,
speaker amplifiers 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_da7219.c | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/sound/soc/intel/boards/sof_da7219.c b/sound/soc/intel/boards/sof_da7219.c
index ecb1d4b25ea6..cc5e99b21456 100644
--- a/sound/soc/intel/boards/sof_da7219.c
+++ b/sound/soc/intel/boards/sof_da7219.c
@@ -19,9 +19,10 @@
#include "sof_maxim_common.h"
/* Driver-specific board quirks: from bit 0 to 7 */
-#define SOF_DA7219_CML_BOARD BIT(0)
-#define SOF_DA7219_JSL_BOARD BIT(1)
-#define SOF_DA7219_MCLK_EN BIT(2)
+#define SOF_DA7219_GLK_BOARD BIT(0)
+#define SOF_DA7219_CML_BOARD BIT(1)
+#define SOF_DA7219_JSL_BOARD BIT(2)
+#define SOF_DA7219_MCLK_EN BIT(3)
#define DIALOG_CODEC_DAI "da7219-hifi"
@@ -296,6 +297,14 @@ sof_card_dai_links_create(struct device *dev, struct snd_soc_card *card,
return 0;
}
+#define GLK_LINK_ORDER SOF_LINK_ORDER(SOF_LINK_AMP, \
+ SOF_LINK_CODEC, \
+ SOF_LINK_DMIC01, \
+ SOF_LINK_IDISP_HDMI, \
+ SOF_LINK_NONE, \
+ SOF_LINK_NONE, \
+ SOF_LINK_NONE)
+
#define CML_LINK_ORDER SOF_LINK_ORDER(SOF_LINK_AMP, \
SOF_LINK_CODEC, \
SOF_LINK_DMIC01, \
@@ -333,7 +342,13 @@ static int audio_probe(struct platform_device *pdev)
if (mach->mach_params.codec_mask & IDISP_CODEC_MASK)
ctx->hdmi.idisp_codec = true;
- if (board_quirk & SOF_DA7219_CML_BOARD) {
+ if (board_quirk & SOF_DA7219_GLK_BOARD) {
+ /* dmic16k not support */
+ ctx->dmic_be_num = 1;
+
+ /* overwrite the DAI link order for GLK boards */
+ ctx->link_order_overwrite = GLK_LINK_ORDER;
+ } else if (board_quirk & SOF_DA7219_CML_BOARD) {
/* overwrite the DAI link order for CML boards */
ctx->link_order_overwrite = CML_LINK_ORDER;
@@ -427,6 +442,12 @@ static int audio_probe(struct platform_device *pdev)
}
static const struct platform_device_id board_ids[] = {
+ {
+ .name = "glk_da7219_def",
+ .driver_data = (kernel_ulong_t)(SOF_DA7219_GLK_BOARD |
+ SOF_SSP_PORT_CODEC(2) |
+ SOF_SSP_PORT_AMP(1)),
+ },
{
.name = "cml_da7219_def",
.driver_data = (kernel_ulong_t)(SOF_DA7219_CML_BOARD |
--
2.40.1
next prev parent reply other threads:[~2024-04-26 15:25 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-26 15:25 [PATCH 00/23] ASoC: Intel: updates for 6.10 - part6 Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 01/23] ASoC: Intel: nau8825/rt5682: move speaker widget to common modules Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 02/23] ASoC: Intel: sof_maxim_common: support MAX98390 on cml boards Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 03/23] ASoC: Intel: sof_da7219: support MAX98390 Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 04/23] ASoC: Intel: sof_da7219: add cml_da7219_def for cml boards Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 05/23] ASoC: Intel: sof_da7219: support MAX98390 on " Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 06/23] ASoC: Intel: bxt_da7219_max98357a: remove MAX98390 support Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 07/23] ASoC: Intel: sof_rt5682: add missing MAX98357A config Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 08/23] ASoC: Intel: sof_da7219: support MAX98357A Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 09/23] ASoC: Intel: sof_da7219: support MAX98357A on cml boards Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 10/23] ASoC: Intel: bxt_da7219_max98357a: remove cml support Pierre-Louis Bossart
2024-04-26 15:25 ` Pierre-Louis Bossart [this message]
2024-04-26 15:25 ` [PATCH 12/23] ASoC: Intel: sof_da7219: support MAX98357A on glk boards Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 13/23] ASoC: Intel: bxt_da7219_max98357a: remove glk support Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 14/23] ASoC: Intel: sof_rt5682: add glk_rt5682_def for glk boards Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 15/23] ASoC: Intel: sof_rt5682: support MAX98357A on " Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 16/23] ASoC: Intel: glk_rt5682_max98357a: delete driver Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 17/23] ASoC: Intel: sof-rt5682: add mclk_en to sof_rt5682_private Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 18/23] ASoC: Intel: sof-rt5682: remove SOF_RT5682_MCLK_BYTCHT_EN Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 19/23] ASoC: Intel: sof_rt5682: add icl_rt5682_def for icl boards Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 20/23] ASoC: Intel: sof-rt5682: add driver_data to sof_rt5682 board Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 21/23] ASoC: Intel: sof-rt5682: setup pll_id only when needed Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 22/23] ASoC: Intel: sof-rt5682: get bclk frequency from topology Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 23/23] ASoC: Intel: sof-rt5682: support bclk as PLL source on rt5682s Pierre-Louis Bossart
2024-05-01 13:43 ` [PATCH 00/23] ASoC: Intel: updates for 6.10 - part6 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=20240426152529.38345-12-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).