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 20/23] ASoC: Intel: sof-rt5682: add driver_data to sof_rt5682 board
Date: Fri, 26 Apr 2024 10:25:26 -0500 [thread overview]
Message-ID: <20240426152529.38345-21-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>
Move default BYT/CHT quirk to driver_data of sof_rt5682 board. This
fixes a problem that DMI quirk of Minnowboard board got overwritten in
probe function since it's a BYT board.
Fixes: c68e07970eca ("ASoC: intel: sof_rt5682: Add quirk for number of HDMI DAI's")
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_rt5682.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 7a35db5cab35..668b1672f570 100644
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -638,7 +638,6 @@ static int sof_audio_probe(struct platform_device *pdev)
struct snd_soc_acpi_mach *mach = pdev->dev.platform_data;
struct sof_card_private *ctx;
char *card_name;
- bool is_legacy_cpu = false;
int ret;
if (pdev->id_entry && pdev->id_entry->driver_data)
@@ -646,14 +645,6 @@ static int sof_audio_probe(struct platform_device *pdev)
dmi_check_system(sof_rt5682_quirk_table);
- if (soc_intel_is_byt() || soc_intel_is_cht()) {
- is_legacy_cpu = true;
-
- /* default quirk for legacy cpu */
- sof_rt5682_quirk = SOF_RT5682_MCLK_EN |
- SOF_SSP_PORT_CODEC(2);
- }
-
dev_dbg(&pdev->dev, "sof_rt5682_quirk = %lx\n", sof_rt5682_quirk);
/* initialize ctx with board quirk */
@@ -676,7 +667,7 @@ static int sof_audio_probe(struct platform_device *pdev)
if (mach->mach_params.codec_mask & IDISP_CODEC_MASK)
ctx->hdmi.idisp_codec = true;
- if (is_legacy_cpu) {
+ if (soc_intel_is_byt() || soc_intel_is_cht()) {
ctx->rt5682.is_legacy_cpu = true;
ctx->dmic_be_num = 0;
/* HDMI is not supported by SOF on Baytrail/CherryTrail */
@@ -792,6 +783,8 @@ static int sof_audio_probe(struct platform_device *pdev)
static const struct platform_device_id board_ids[] = {
{
.name = "sof_rt5682",
+ .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
+ SOF_SSP_PORT_CODEC(2)),
},
{
.name = "glk_rt5682_def",
--
2.40.1
next prev parent reply other threads:[~2024-04-26 15:31 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 ` [PATCH 11/23] ASoC: Intel: sof_da7219: add glk_da7219_def for glk boards Pierre-Louis Bossart
2024-04-26 15:25 ` [PATCH 12/23] ASoC: Intel: sof_da7219: support MAX98357A on " 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 ` Pierre-Louis Bossart [this message]
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-21-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).