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

ucm2: sof-soundwire: Use one file for speaker codec initialization #370

Closed
wants to merge 2 commits into from

Conversation

perexg
Copy link
Member

@perexg perexg commented Dec 6, 2023

Use macros to minimize configuration blocks.

@perexg perexg force-pushed the sdw-spk branch 4 times, most recently from 12d8b57 to 5bf138b Compare December 6, 2023 15:50
Use macros to minimize configuration blocks.

Signed-off-by: Jaroslav Kysela <[email protected]>
Copy link
Contributor

@charleskeepax charleskeepax left a comment

Choose a reason for hiding this comment

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

I will give this a test today as well, but I think we need some slight tweaks.

DisableSequence [
cset "name='AMP${var:__Amp} Speaker Switch' 0"
]
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Personally the ControlExists version seemed simpler, but I am happy with this if you prefer it.

Macro.num5.cs42l43spk { ForAmps "[68]" Amp 5 }
Macro.num6.cs42l43spk { ForAmps "[68]" Amp 6 }
Macro.num7.cs42l43spk { ForAmps "8" Amp 7 }
Macro.num8.cs42l43spk { ForAmps "8" Amp 8 }
Copy link
Contributor

Choose a reason for hiding this comment

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

We should include odd number as well, we have seen a few models with odd number typically the odd speaker being a single sub-woofer.

We do also have a case of a development board which has speakers 1,2,7,8, technically its an 8 speaker board but a commonly used configuration is 4 channels. It is nice if the amp numbers can line up to the physical outputs in use.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, I replaced this with [2-8] like regex expressions in latest config.

cs35l56 is a boosted speaker amp, add UCM support for configurations
with up to 8 amps.

Signed-off-by: Charles Keepax <[email protected]>
Signed-off-by: Jaroslav Kysela <[email protected]>
Copy link
Contributor

@charleskeepax charleskeepax left a comment

Choose a reason for hiding this comment

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

Works on my system and looks fine to me.

@perexg perexg closed this in c0a4df6 Jan 9, 2024
perexg pushed a commit that referenced this pull request Jan 9, 2024
cs35l56 is a boosted speaker amp, add UCM support for configurations
with up to 8 amps.

Closes: #370
Signed-off-by: Charles Keepax <[email protected]>
Signed-off-by: Jaroslav Kysela <[email protected]>
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.

2 participants