Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ASoC: Intel: sof_rt5682: Add support for Rex with discrete BT offload. #4551

Merged
merged 2 commits into from
Sep 6, 2023

Conversation

udaymb
Copy link

@udaymb udaymb commented Aug 28, 2023

System firmware has included additional audio DMI string MAX98360_ALC5682I_DISCRETE_I2S_BT for discrete BT offload supporting devices. Same DMI string match is introduced in sof_rt5682_quirk_table.

DMI match is introduced as per the changes in https://review.coreboot.org/c/coreboot/+/77357

SOF_SPEAKER_AMP_PRESENT |
SOF_MAX98360A_SPEAKER_AMP_PRESENT |
SOF_RT5682_SSP_AMP(0) |
SOF_RT5682_NUM_HDMIDEV(4) |
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plbossart Do we want to support 4 HDMI on MTL I2S machines?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, we added 3 only in topology2 files.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, we added 3 only in topology2 files.

@udaymb, then SOF_RT5682_NUM_HDMIDEV should be 3, and same as line 222.

Copy link

@RDharageswari RDharageswari Aug 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a quirk SOF_PDM_NUM_CHANNELS() and load the 2ch and 4ch topologies accordingly based on the DMI information?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This quirk is not necessary since SOF_SPEAKER_AMP_PRESENT and SOF_*_SPEAKER_AMP_PRESENT are removed.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bardliao - modified SOF_RT5682_NUM_HDMIDEV to 3
@brentlu - rebased it to get the latest changes and based on that removed these quirk entries SOF_SPEAKER_AMP_PRESENT and SOF_*_SPEAKER_AMP_PRESENT

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to change SPK_ID to 6 in topology cmake file if changing HDMIDEV to 3 or amplifier BE ID will mismatch.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated topology - thesofproject/sof#8131

@brentlu
Copy link

brentlu commented Aug 28, 2023

As I know we only support CNVI BT, not discrete. Things change?

@sathya-nujella
Copy link

As I know we only support CNVI BT, not discrete. Things change?

Yes, both integrated and discrete are supported on Rex models.

@udaymb
Copy link
Author

udaymb commented Aug 29, 2023

As I know we only support CNVI BT, not discrete. Things change?

This is also CNVI BT - but its discrete, compared to earlier integrated BT, for discrete BT there is additional change in the system firmware - handled as part of this patch https://review.coreboot.org/c/coreboot/+/77357. This will set additional gpio configuration compared to integrated BT offload. So, system firmware has introduced additional dmi match for this scenario. Hence, this needs to be handled in Kernel to match this device

System firmware has included additional audio DMI string
MAX98360_ALC5682I_DISCRETE_I2S_BT for discrete BT offload
supporting devices. Same DMI string match is introduced
in sof_rt5682_quirk_table.

Signed-off-by: Uday M Bhat <[email protected]>
bardliao
bardliao previously approved these changes Aug 29, 2023
plbossart
plbossart previously approved these changes Aug 30, 2023
For all MTL/Rex devices, number of HDMI supported is 3.

Signed-off-by: Yong Zhi <[email protected]>
Signed-off-by: Uday M Bhat <[email protected]>
@udaymb udaymb dismissed stale reviews from plbossart and bardliao via 625d3ca September 1, 2023 17:11
@bardliao bardliao merged commit 9ac8ea5 into thesofproject:topic/sof-dev Sep 6, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants