DA7219 machine driver update #4542

brentlu · 2023-08-24T05:24:41Z

In preparation for ADL board support, I refactor the machine driver to use maxim-common module and remove redundant code. No functional change here and driver is tested on JSL board with MAX98360A amplifier.
Add adl_mx98360_da7219 board config to support DA7219 on ADL boards; tested on ADL-N chromebook

brentlu · 2023-08-28T14:32:47Z

Could we merge this PR? Thanks.

plbossart · 2023-08-28T15:48:27Z

Can you revisit the checkpatch warnings @brentlu?

WARNING: struct snd_soc_ops should normally be const
#159: FILE: sound/soc/intel/boards/sof_da7219.c:194:
+static struct snd_soc_ops max98373_ops = {

CHECK: braces {} should be used on all arms of this statement
#259: FILE: sound/soc/intel/boards/sof_da7219.c:368:
+	if (sof_da7219_quirk & SOF_MAX98360A_SPEAKER_AMP_PRESENT)
[...]
+	else if (sof_da7219_quirk & SOF_MAX98373_SPEAKER_AMP_PRESENT) {
[...]

brentlu · 2023-08-29T02:45:47Z

add const to max98373_ops
remove global variable 'headset'
add one commit for adl_mx98360_da7219 board; tested on ADL-N chromebook with topology topology1: adl-max98360a-da7219: support DA7219 headphone codec sof#8103

brentlu · 2023-08-29T02:54:27Z

fix the warning about brace

brentlu · 2023-08-29T12:19:07Z

rebase to see if it could pass the build test...

plbossart

I think this can be improved a bit @brentlu

It's not all bad but you are doing things differently to the other recent PRs so the code is a bit inconsistent in the directions.

sound/soc/intel/boards/Kconfig

sound/soc/intel/boards/sof_da7219.c

plbossart · 2023-08-29T14:55:00Z

sound/soc/intel/boards/sof_da7219.c

+	 * frequency of MCLK to 12.288 or 24.576MHz on topology side.
+	 */
+	if (board_quirk & SOF_DA7219_PLL_BYPASS)
+		ctx->pll_bypass = 1;


why is this needed? What not just test the MCLK and automatically bypass the PLL if it's 12.228 or a multiple?

oh I can do it in codec init. let me upload a new version.

plbossart

only nit-picks from me...

plbossart · 2023-08-29T17:02:15Z

sound/soc/intel/boards/Kconfig

-	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
-	select SND_SOC_INTEL_HDA_DSP_COMMON
+	depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\
+		    (MFD_INTEL_LPSS || COMPILE_TEST))


i would keep the initial code

plbossart · 2023-08-29T17:03:04Z

sound/soc/intel/boards/Kconfig

 	select SND_SOC_MAX98373_I2C
 	select SND_SOC_DMIC
+	select SND_SOC_INTEL_HDA_DSP_COMMON


this is already in the initial code,

sound/soc/intel/boards/sof_da7219.c

plbossart

lost on the last patch, sorry

sound/soc/intel/boards/sof_da7219.c

plbossart · 2023-08-30T14:56:01Z

sound/soc/intel/boards/sof_da7219.c

 	},
 	{
 		.name = "adl_mx98360_da7219",
-		.driver_data = (kernel_ulong_t)(SOF_MAX98360A_SPEAKER_AMP_PRESENT),
+		.driver_data = (kernel_ulong_t)(0),


so do we need this quirk at all then?

No quirk is needed for this board config now.

what happens if we just don't add .driver_data and add a comment to that effect?

unsigned long board_quirk = 0; ... if (pdev->id_entry && pdev->id_entry->driver_data) board_quirk = (unsigned long)pdev->id_entry->driver_data;

Since driver_data is zero (NULL), board_quirk will be the init value 0. It's working good on my ADL board.

brentlu · 2023-08-30T15:22:05Z

The last patch just remove two quirks flags of amplifier type from board configs. No functional change there.

plbossart · 2023-09-07T13:03:25Z

rebase needed @brentlu

brentlu · 2023-09-07T13:22:30Z

conflict in acpi enumeration table, resolved

plbossart · 2023-09-07T17:17:20Z

@bardliao I'll let you merge this.

Rename the driver file and kernel option to be consistent with other SOF machine drivers. Signed-off-by: Brent Lu <[email protected]>

Use maxim-common module to handle speaker amp DAI link registration. No functional change in this commit. Signed-off-by: Brent Lu <[email protected]>

This configuration supports ADL boards which implement DA7219 on SSP0 and MAX98360A on SSP1. DA7219 uses PLL bypass mode to avoid WCLK locking problem. To use this mode, MCLK frequency must be 12.288 or 24.576MHz. Signed-off-by: Brent Lu <[email protected]>

Use ssp-common module to detect codec and amplifier type in driver probe function and remove all quirks about amplifier type. Signed-off-by: Brent Lu <[email protected]>

brentlu requested review from lgirdwood, plbossart, ranj063, kv2019i, dbaluta, bardliao, ujfalusi, vijendarmukunda, kuanhsuncheng and yaochunhung as code owners August 24, 2023 05:24

brentlu added Chrome Related to Chrome integration JSL Jasper Lake platform issues ADL Applies to Alder Lake platform labels Aug 24, 2023

bardliao previously approved these changes Aug 24, 2023

View reviewed changes

plbossart previously approved these changes Aug 24, 2023

View reviewed changes

brentlu dismissed stale reviews from plbossart and bardliao via d014017 August 29, 2023 02:29

brentlu force-pushed the da7219-update branch 2 times, most recently from 1c225ea to 02588d3 Compare August 29, 2023 02:29

brentlu force-pushed the da7219-update branch from d014017 to 19cfec6 Compare August 29, 2023 02:50

brentlu mentioned this pull request Aug 29, 2023

topology1: adl-max98360a-da7219: support DA7219 headphone codec thesofproject/sof#8103

Merged

brentlu force-pushed the da7219-update branch from 19cfec6 to b0e9b32 Compare August 29, 2023 12:18

plbossart reviewed Aug 29, 2023

View reviewed changes

brentlu force-pushed the da7219-update branch 2 times, most recently from 14f5f49 to 979be74 Compare August 29, 2023 16:44

plbossart reviewed Aug 29, 2023

View reviewed changes

brentlu force-pushed the da7219-update branch from 979be74 to 0e2f6fd Compare August 30, 2023 01:22

bardliao previously approved these changes Aug 30, 2023

View reviewed changes

plbossart requested changes Aug 30, 2023

View reviewed changes

brentlu dismissed bardliao’s stale review via 1770ffe August 31, 2023 00:01

brentlu force-pushed the da7219-update branch 3 times, most recently from a25c47b to 4845f07 Compare August 31, 2023 01:30

plbossart previously approved these changes Sep 6, 2023

View reviewed changes

plbossart requested a review from bardliao September 6, 2023 13:04

bardliao previously approved these changes Sep 7, 2023

View reviewed changes

brentlu dismissed stale reviews from bardliao and plbossart via db3eca8 September 7, 2023 13:17

brentlu force-pushed the da7219-update branch from 4845f07 to db3eca8 Compare September 7, 2023 13:17

plbossart approved these changes Sep 7, 2023

View reviewed changes

plbossart requested a review from bardliao September 7, 2023 17:16

brentlu added 4 commits September 8, 2023 04:59

ASoC: Intel: sof_da7219: rename driver file and kernel option

2fa6d7f

Rename the driver file and kernel option to be consistent with other SOF machine drivers. Signed-off-by: Brent Lu <[email protected]>

ASoC: Intel: sof_da7219: use maxim-common module

6ae65a0

Use maxim-common module to handle speaker amp DAI link registration. No functional change in this commit. Signed-off-by: Brent Lu <[email protected]>

ASoC: Intel: sof_da7219: use ssp-common module to detect codec

db3eca8

Use ssp-common module to detect codec and amplifier type in driver probe function and remove all quirks about amplifier type. Signed-off-by: Brent Lu <[email protected]>

bardliao approved these changes Sep 8, 2023

View reviewed changes

bardliao merged commit 72c81dd into thesofproject:topic/sof-dev Sep 8, 2023
9 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DA7219 machine driver update #4542

DA7219 machine driver update #4542

brentlu commented Aug 24, 2023 •

edited

Loading

brentlu commented Aug 28, 2023

plbossart commented Aug 28, 2023

brentlu commented Aug 29, 2023 •

edited

Loading

brentlu commented Aug 29, 2023

brentlu commented Aug 29, 2023

plbossart left a comment

plbossart Aug 29, 2023

brentlu Aug 29, 2023

plbossart left a comment

plbossart Aug 29, 2023

brentlu Sep 5, 2023

plbossart Aug 29, 2023

brentlu Sep 5, 2023

plbossart left a comment

plbossart Aug 30, 2023

brentlu Aug 30, 2023

plbossart Aug 30, 2023

brentlu Sep 5, 2023 •

edited

Loading

brentlu commented Aug 30, 2023

plbossart commented Sep 7, 2023

brentlu commented Sep 7, 2023

plbossart commented Sep 7, 2023

DA7219 machine driver update #4542

DA7219 machine driver update #4542

Conversation

brentlu commented Aug 24, 2023 • edited Loading

brentlu commented Aug 28, 2023

plbossart commented Aug 28, 2023

brentlu commented Aug 29, 2023 • edited Loading

brentlu commented Aug 29, 2023

brentlu commented Aug 29, 2023

plbossart left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

plbossart left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

plbossart left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brentlu Sep 5, 2023 • edited Loading

Choose a reason for hiding this comment

brentlu commented Aug 30, 2023

plbossart commented Sep 7, 2023

brentlu commented Sep 7, 2023

plbossart commented Sep 7, 2023

brentlu commented Aug 24, 2023 •

edited

Loading

brentlu commented Aug 29, 2023 •

edited

Loading

brentlu Sep 5, 2023 •

edited

Loading