Support a larger range of amp feedback channel counts#9624
Merged
lgirdwood merged 2 commits intothesofproject:mainfrom Oct 30, 2024
Merged
Support a larger range of amp feedback channel counts#9624lgirdwood merged 2 commits intothesofproject:mainfrom
lgirdwood merged 2 commits intothesofproject:mainfrom
Conversation
Replace the hardcoded assumption of 2 feedback channels per link
A new constant AMP_FEEDBACK_CH_PER_LINK is added to set the number of
channels for the link BE DAI, replacing the original hardcoded value
of 2.
The default values are:
For NUM_SDW_AMP_LINKS=1:
AMP_FEEDBACK_CH=2, AMP_FEEDBACK_CH_PER_LINK=2
For NUM_SDW_AMP_LINKS=2:
AMP_FEEDBACK_CH=4, AMP_FEEDBACK_CH_PER_LINK=2
The alh-copier definition has been rewritten so that it is based only on
AMP_FEEDBACK_CH, instead of making assumptions from NUM_SDW_AMP_LINKS.
It supports 2 or 4 total feedback channels. Support for 1 and 3 feedback
channels has not been included because these are unusual and the code is
smaller without them. They can be added later if they are needed.
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Add support for 6 channel and 8 channel amp feedback. The host-copier defaults provide 2 channel stereo and 4 channel 3.1. Use the value of AMP_FEEDBACK_CH to set special case input and output formats for 6 channels and 8 channels. The alh-copier also needs special cases for 6 and 8 channels. Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
lgirdwood
approved these changes
Oct 30, 2024
Member
|
@bardliao pls review |
bardliao
approved these changes
Oct 30, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
These two patches expand the possible combinations of feedback channel count and number of links.
It has been tested on these combinations:
1 bus, 2 amps, 1 fb channel per amp, total 2 channels
1 bus, 2 amps, 2 fb channel per amp, total 4 channels
1 bus, 4 amps, 1 fb channel per amp, total 4 channels
2 buses, 1 amp per bus, 1 fb channel per amp, total 2 channels
2 buses, 1 amp per bus, 2 fb channel per amp, total 4 channels
2 buses, 1 amp per bus, 4 fb channel per amp, total 8 channels
2 buses, 2 amp per bus, 1 fb channel per amp, total 4 channels
2 buses, 2 amp per bus, 2 fb channel per amp, total 8 channels
2 buses, 3 amp per bus, 1 fb channel per amp, total 6 channels
2 buses, 4 amp per bus, 1 fb channel per amp, total 8 channels