board_helper: support amp link #4666
Conversation
brentlu
requested review from
lgirdwood,
plbossart,
ranj063,
kv2019i,
dbaluta,
bardliao,
ujfalusi,
vijendarmukunda,
kuanhsuncheng and
yaochunhung
as code owners
| break; | ||
| case CODEC_RT5650: | ||
| /* special case for all-in-one codec, caller to handle */ | ||
| break; |
There was a problem hiding this comment.
I think this change probably exposes randconfig problems. If you add these codec-specific parts in SND_SOC_INTEL_SOF_BOARD_HELPERS then you need to do a select ... of all the required codecs. Currently this is only added on a board-by-board basis.
IOW, you need this:
config SND_SOC_INTEL_SOF_BOARD_HELPERS
tristate
select SND_SOC_INTEL_SOF_MAXIM_COMMON
select SND_SOC_INTEL_SOF_NUVOTON_COMMON
select SND_SOC_INTEL_SOF_REALTEK_COMMON
select SND_SOC_INTEL_SOF_CIRRUS_COMMON
And arguably this is the main issue with this PR, we would now have to select all codecs even when they are not used by a distro.
Can we instead pass the sof_codec_dai_link() function as an argument to avoid this switch case and avoid bundling everything together? Same for set_codec_conf(), centralizing everything is not very good in terms of modularity. We should let users or distros the ability to select which board they want, and not bundle everything together IMHO.
There was a problem hiding this comment.
What I am trying to do is moving all amp support code to the intal-board module so we could add amp support once and for all machine drivers. Thanks for pointing out the module loading problem and I'll do experiment to observe the behavior of run-time kernel module loading and see if we could avoid it.
There was a problem hiding this comment.
A new version was uploaded to left codec-specific part in machine drivers.
brentlu
force-pushed
the
intel-board-3
branch
from
945972e to
68750ff
Compare
|
Update a new version which implements sof_intel_board_set_amp_link() function to initialize speaker amplifier dai link structure. Codec-specific fields are left for caller to complete. |
brentlu
force-pushed
the
intel-board-3
branch
from
68750ff to
787ccb6
Compare
| @@ -248,6 +248,48 @@ int sof_intel_board_set_intel_hdmi_link(struct device *dev, | |||
| } | |||
| EXPORT_SYMBOL_NS(sof_intel_board_set_intel_hdmi_link, SND_SOC_INTEL_SOF_BOARD_HELPERS); | |||
|
|
|||
| int sof_intel_board_set_amp_link(struct device *dev, | |||
There was a problem hiding this comment.
It is for SSP amp only, better to rename to sof_intel_board_set_ssp_amp_link. We may have a similar helper for sdw amp someday.
| @@ -44,6 +45,7 @@ struct sof_card_private { | |||
| int hdmi_num; | |||
|
|
|||
| int ssp_codec; | |||
| int ssp_amp; | |||
There was a problem hiding this comment.
Hmm, where will ctx->ssp_amp be used?
There was a problem hiding this comment.
I planned to submit another PR later which implements a helper function to generate entire DAI link array according to the content of sof_card_private structure. You could check the code here:
brentlu
force-pushed
the
intel-board-3
branch
from
787ccb6 to
1d1b24e
Compare
brentlu
force-pushed
the
intel-board-3
branch
from
1d1b24e to
73e8cbe
Compare
Add a helper function for machine drivers to initialize speaker amplifier DAI link. The function will initialize common fields and let caller to initialize codec-specific fields like codec, init, exit, and ops fields. Signed-off-by: Brent Lu <[email protected]>
Use intel_board module for speaker amplifier DAI link initialization. Signed-off-by: Brent Lu <[email protected]>
Use intel_board module for speaker amplifier DAI link initialization. Signed-off-by: Brent Lu <[email protected]>
Use intel_board module for speaker amplifier DAI link initialization. Signed-off-by: Brent Lu <[email protected]>
Use intel_board module for speaker amplifier DAI link initialization. Signed-off-by: Brent Lu <[email protected]>
Rename the parameter 'ssp_codec' of sof_card_dai_links_create() since it's the port number of speaker amplifier. No functional change in this commit. Signed-off-by: Brent Lu <[email protected]>
Two helper functions are implemented, sof_intel_board_set_amp_link() to initialize speaker amplifier dai link structure and sof_intel_board_set_codec_conf() to update codec_conf field of snd_soc_card structure. With these two functions implemented in a common module, we don't have to enable amplifier in machine drivers one by one.