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

Board id cleanup for sof_rt5682 #4722

Merged
merged 6 commits into from
Dec 6, 2023

Conversation

brentlu
Copy link

@brentlu brentlu commented Nov 29, 2023

Many board configs are duplicated since codec and amplifier type are removed from board quirk. Introduce "jsl_rt5682_def", "tgl_rt5682_def", "adl_rt5682_def", "rpl_nau8825_def", and "mtl_rt5682_def" board id to reduce the number of board configs.

Also cleanup redundant DMI quirks for mtl boards.

Many board configs are duplicated since codec and amplifier type are
removed from board quirk. Introduce "jsl_rt5682_def" board to reduce
the number of jsl board configs.

Signed-off-by: Brent Lu <[email protected]>
Many board configs are duplicated since codec and amplifier type are
removed from board quirk. Introduce "tgl_rt5682_def" board to reduce
the number of tgl board configs.

Signed-off-by: Brent Lu <[email protected]>
Many board configs are duplicated since codec and amplifier type are
removed from board quirk. Introduce "adl_rt5682_def" board to reduce
the number of adl board configs.

Signed-off-by: Brent Lu <[email protected]>
Many board configs are duplicated since codec and amplifier type are
removed from board quirk. Introduce "rpl_rt5682_def" board to reduce
the number of rpl board configs.

Signed-off-by: Brent Lu <[email protected]>
Many board configs are duplicated since codec and amplifier type are
removed from board quirk. Introduce "mtl_rt5682_def" board to reduce
the number of mtl board configs.

Signed-off-by: Brent Lu <[email protected]>
Some dmi quirks are duplicated since codec and amplifier type are
removed from board quirk. Remove redundant quirks.

Signed-off-by: Brent Lu <[email protected]>
SOF_RT5682_SSP_CODEC(2) |
SOF_RT5682_SSP_AMP(0) |
SOF_RT5682_NUM_HDMIDEV(3)
),
Copy link
Collaborator

Choose a reason for hiding this comment

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

This one doesn't have SOF_BT_OFFLOAD_SSP(1) and SOF_SSP_BT_OFFLOAD_PRESENT, should we keep it?

Copy link
Author

Choose a reason for hiding this comment

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

It's weird that BT offload quirk is missing since we try to enable it as long as possible. I'll talk to Mac to see if we could enable it. Removing this entry does no harm anyway, we just have a BE DAI link which does not connect to any FE link.

Copy link
Author

Choose a reason for hiding this comment

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

As I know it's a wifi module connected via USB so BT offload is not supported. However, I think it's fine to remove this entry since we just add an BE link instead of FE link. There is no change from PCM device point of view.

Copy link
Collaborator

Choose a reason for hiding this comment

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

As I know it's a wifi module connected via USB so BT offload is not supported. However, I think it's fine to remove this entry since we just add an BE link instead of FE link. There is no change from PCM device point of view.

@brentlu I don't mind we keep the BE. But we need to make sure no BE id will change with or without the BT offload BE. sof_intel_board_set_dai_link() add HDMI-In links after BT offload links. There is no SOF_HDMI_CAPTURE_SSP_MASK in those quirks. So, I think it should be safe to remove this entry.

@keqiaozhang
Copy link
Collaborator

SOFCI TEST

@plbossart plbossart merged commit cb13331 into thesofproject:topic/sof-dev Dec 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.

4 participants