Add DAPM/ASoC helpers to create SDCA drivers
Subsystems (3)
Charles Keepax
maintainerv4 cover Add DAPM/ASoC helpers to create SDCA drivers
Add helper functions to add DAPM widgets, routes, ALSA controls, and DAI drivers, these will be used to create SDCA function device drivers.
This series should provide most of the core functionality needed to get a device registered and have a working DAPM graph within the device. There are some features that still need additional work, these are marked with FIXMEs in the code. The two main things are SDCA Clock Muxes (not used in our devices and needs some ASoC core work), and better support for more complex SDCA volume control definitions (our parts have fairly simple volumes, and SDCA has a large amount of flexibility in how the volume control is specified).
The next steps in the process are to add helpers for the DAI ops themselves, some IRQ handling, and firmware download. And finally we should be able to actually add the SDCA class driver itself.
Thanks,
Charles
Changes since v3:
- Add pin switches for non-dataport terminals
- Add a minor cleanup to one of the SDCA parsing functions
Charles Keepax (5):
ASoC: SDCA: Move allocation of PDE delays array
ASoC: dapm: Add component level pin switches
ASoC: SDCA: Create DAPM widgets and routes from DisCo
ASoC: SDCA: Create ALSA controls from DisCo
ASoC: SDCA: Create DAI drivers from DisCo
include/sound/sdca_asoc.h | 42 + include/sound/sdca_function.h | 69 ++ include/sound/soc-dapm.h | 4 + sound/soc/sdca/Makefile | 2 +- sound/soc/sdca/sdca_asoc.c | 1301 +++++++++++++++++++++++++++++++ sound/soc/sdca/sdca_functions.c | 10 +- sound/soc/soc-dapm.c | 84 +- 7 files changed, 1491 insertions(+), 21 deletions(-) create mode 100644 include/sound/sdca_asoc.h create mode 100644 sound/soc/sdca/sdca_asoc.c
Signature · 1 line
2.39.5
Charles Keepax
maintainerPATCH v4 1/5 ASoC: SDCA: Move allocation of PDE delays array
Move the allocation of the PDE delays array until after the size has been adjusted, this saves an additional division and simplifies the code slightly.
---
New since v3.
sound/soc/sdca/sdca_functions.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
sound/soc/sdca/sdca_functions.c +4 -6
@@ -1105,12 +1105,6 @@ static int find_sdca_entity_pde(struct device *dev,return -EINVAL ; } -/* There are 3 values per delay */ - delays =devm_kcalloc (dev, num_delays / mult_delay, -sizeof (*delays),GFP_KERNEL ); -if (!delays) -return -ENOMEM ; - delay_list =kcalloc (num_delays,sizeof (*delay_list),GFP_KERNEL );if (!delay_list)return -ENOMEM ;
@@ -1121,6 +1115,10 @@ static int find_sdca_entity_pde(struct device *dev, num_delays /= mult_delay; + delays =devm_kcalloc (dev, num_delays,sizeof (*delays),GFP_KERNEL ); +if (!delays) +return -ENOMEM ; +for (i =0 , j =0 ; i < num_delays; i++) { delays[i].from_ps = delay_list[j++]; delays[i].to_ps = delay_list[j++];
Signature · 1 line
2.39.5
Charles Keepax
maintainerPATCH v4 2/5 ASoC: dapm: Add component level pin switches
In reply to Charles KeepaxThe core currently supports pin switches for source/sink widgets, but only at the card level. SDCA components specify the fabric at the level of the individual components, to support this add helpers to allow component level pin switches.
---
New since v3.
include/sound/soc-dapm.h | 4 ++ sound/soc/soc-dapm.c | 84 +++++++++++++++++++++++++++++++++------- 2 files changed, 74 insertions(+), 14 deletions(-)
include/sound/soc-dapm.h +4 -0
@@ -445,6 +445,10 @@ int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *uncontrol);int snd_soc_dapm_put_pin_switch (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *uncontrol); +int snd_soc_dapm_get_component_pin_switch (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *uncontrol); +int snd_soc_dapm_put_component_pin_switch (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *uncontrol);int snd_soc_dapm_new_controls (struct snd_soc_dapm_context *dapm,const struct snd_soc_dapm_widget *widget,unsigned int num); struct snd_soc_dapm_widget *snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
sound/soc/soc-dapm.c +70 -14
121 lines not on this page · raw message
Signature · 1 line
2.39.5
Charles Keepax
maintainerPATCH v4 3/5 ASoC: SDCA: Create DAPM widgets and routes from DisCo
In reply to Charles KeepaxUse the previously parsed DisCo information from ACPI to create DAPM widgets and routes representing a SDCA Function. For the most part SDCA maps well to the DAPM abstractions.
The primary point of interest is the SDCA Power Domain Entities (PDEs), which actually control the power status of the device. Whilst these PDEs are the primary widgets the other parts of the SDCA graph are added to maintain a consistency with the hardware abstract, and allow routing to take effect. As for the PDEs themselves the code currently only handle PS0 and PS3 (basically on and off), the two intermediate power states are not commonly used and don't map well to ASoC/DAPM.
Other minor points of slightly complexity include, the Group Entities (GEs) these set the value of several other controls, typically Selector Units (SUs) for enabling a cetain jack configuration. Multiple SUs being controlled by a GE are easily modelled creating a single control and sharing it among the controlled muxes.
SDCA also has a slight habit of having fully connected paths, relying more on activating the PDEs to enable functionality. This doesn't map quite so perfectly to DAPM which considers the path a reason to power the PDE. Whilst in the current specification Mixer Units are defined as fixed-function, in DAPM we create a virtual control for each input (which defaults to connected). This allows paths to be connected/disconnected, providing a more ASoC style approach to managing the power. PIN_SWITCHs will also be added for non-dataport terminal entities in a later patch along with the other ALSA controls, providing greater flexibility in power management.
A top level helper sdca_asoc_populate_component() is exported that counts and allocates everything, however, the intermediate counting and population functions are also exported. This will allow end drivers to do allocation and add custom handling, which is probably fairly likely for the early SDCA devices.
Clock muxes are currently not fully supported, so some future work will also be required there.
---
Changes since v3:
- Updated non-dataport terminal widgets to be proper endpoint widgets.
include/sound/sdca_asoc.h | 30 ++ include/sound/sdca_function.h | 36 ++ sound/soc/sdca/Makefile | 2 +- sound/soc/sdca/sdca_asoc.c | 850 ++++++++++++++++++++++++++++++++++ 4 files changed, 917 insertions(+), 1 deletion(-) create mode 100644 include/sound/sdca_asoc.h create mode 100644 sound/soc/sdca/sdca_asoc.c
include/sound/sdca_asoc.h new file +30 -0
@@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* The MIPI SDCA specification is available for public downloads at +* https://www.mipi.org/mipi-sdca-v1-0-download +* +* Copyright (C) 2025 Cirrus Logic, Inc. and +* Cirrus Logic International Semiconductor Ltd. +*/ + +#ifndef __SDCA_ASOC_H__ +#define __SDCA_ASOC_H__ + +struct device ; +struct sdca_function_data ; +struct snd_soc_component_driver ; +struct snd_soc_dapm_route ; +struct snd_soc_dapm_widget ; + +int sdca_asoc_count_component (struct device *dev,struct sdca_function_data *function, +int *num_widgets,int *num_routes); + +int sdca_asoc_populate_dapm (struct device *dev,struct sdca_function_data *function, +struct snd_soc_dapm_widget *widgets, +struct snd_soc_dapm_route *routes); + +int sdca_asoc_populate_component (struct device *dev, +struct sdca_function_data *function, +struct snd_soc_component_driver *component_drv); + +#endif // __SDCA_ASOC_H__
include/sound/sdca_function.h +36 -0
@@ -257,6 +257,14 @@ enum sdca_pde_controls { SDCA_CTL_PDE_ACTUAL_PS = 0x10, }; +/** +* enum sdca_requested_ps_range - Column definitions for Requested PS +*/ +enum sdca_requested_ps_range { +SDCA_REQUESTED_PS_STATE =0 , +SDCA_REQUESTED_PS_NCOLS =1 , +}; +/** * enum sdca_ge_controls - SDCA Controls for Group Unit *
@@ -268,6 +276,15 @@ enum sdca_ge_controls { SDCA_CTL_GE_DETECTED_MODE = 0x02, }; +/** +* enum sdca_selected_mode_range - Column definitions for Selected Mode +*/ +enum sdca_selected_mode_range { +SDCA_SELECTED_MODE_INDEX =0 , +SDCA_SELECTED_MODE_TERM_TYPE =1 , +SDCA_SELECTED_MODE_NCOLS =2 , +}; +/** * enum sdca_spe_controls - SDCA Controls for Security & Privacy Unit *
@@ -773,6 +790,25 @@ enum sdca_terminal_type { SDCA_TERM_TYPE_PRIVACY_INDICATORS = 0x747, }; +#define SDCA_TERM_TYPE_LINEIN_STEREO_NAME "LineIn Stereo" +#define SDCA_TERM_TYPE_LINEIN_FRONT_LR_NAME "LineIn Front-LR" +#define SDCA_TERM_TYPE_LINEIN_CENTER_LFE_NAME "LineIn Center-LFE" +#define SDCA_TERM_TYPE_LINEIN_SURROUND_LR_NAME "LineIn Surround-LR" +#define SDCA_TERM_TYPE_LINEIN_REAR_LR_NAME "LineIn Rear-LR" +#define SDCA_TERM_TYPE_LINEOUT_STEREO_NAME "LineOut Stereo" +#define SDCA_TERM_TYPE_LINEOUT_FRONT_LR_NAME "LineOut Front-LR" +#define SDCA_TERM_TYPE_LINEOUT_CENTER_LFE_NAME "LineOut Center-LFE" +#define SDCA_TERM_TYPE_LINEOUT_SURROUND_LR_NAME "LineOut Surround-LR" +#define SDCA_TERM_TYPE_LINEOUT_REAR_LR_NAME "LineOut Rear-LR" +#define SDCA_TERM_TYPE_MIC_JACK_NAME "Microphone" +#define SDCA_TERM_TYPE_STEREO_JACK_NAME "Speaker Stereo" +#define SDCA_TERM_TYPE_FRONT_LR_JACK_NAME "Speaker Front-LR" +#define SDCA_TERM_TYPE_CENTER_LFE_JACK_NAME "Speaker Center-LFE" +#define SDCA_TERM_TYPE_SURROUND_LR_JACK_NAME "Speaker Surround-LR" +#define SDCA_TERM_TYPE_REAR_LR_JACK_NAME "Speaker Rear-LR" +#define SDCA_TERM_TYPE_HEADPHONE_JACK_NAME "Headphone" +#define SDCA_TERM_TYPE_HEADSET_JACK_NAME "Headset" +/** * enum sdca_connector_type - SDCA Connector Types *
sound/soc/sdca/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -snd-soc-sdca-y := sdca_functions.o sdca_device.o sdca_regmap.o +snd-soc-sdca-y := sdca_functions.o sdca_device.o sdca_regmap.o sdca_asoc.o obj-$(CONFIG_SND_SOC_SDCA) += snd-soc-sdca.o
sound/soc/sdca/sdca_asoc.c new file +850 -0
850 lines not on this page · raw message
Signature · 1 line
2.39.5
Charles Keepax
maintainerPATCH v4 4/5 ASoC: SDCA: Create ALSA controls from DisCo
In reply to Charles KeepaxUse the previously parsed DisCo information from ACPI to create the ALSA controls required by an SDCA Function. This maps all User and Application level SDCA Controls to ALSA controls. Typically controls marked with those access levels are just volumes and mutes.
SDCA defines volume controls as an integer in 1/256ths of a dB and then provides a mechanism to specify what values are valid (range templates). Currently only a simple case of a single linear volume range with a power of 2 step size is supported. This allows the code to expose the volume control using a simple shift. This will need expanded in the future, to support more complex ranges and probably also some additional control types but this should be sufficient to for a first pass.
For non-dataport terminal widgets also add a pin switch to allow that endpoint to be turned on/off.
---
Changes since v3:
- Add pin switch controls for non-dataport terminals
include/sound/sdca_asoc.h | 6 +- include/sound/sdca_function.h | 10 ++ sound/soc/sdca/sdca_asoc.c | 241 +++++++++++++++++++++++++++++++++- 3 files changed, 252 insertions(+), 5 deletions(-)
include/sound/sdca_asoc.h +5 -1
@@ -12,16 +12,20 @@struct device ;struct sdca_function_data ; +struct snd_kcontrol_new ;struct snd_soc_component_driver ;struct snd_soc_dapm_route ;struct snd_soc_dapm_widget ;int sdca_asoc_count_component (struct device *dev,struct sdca_function_data *function, -int *num_widgets,int *num_routes); +int *num_widgets,int *num_routes,int *num_controls);int sdca_asoc_populate_dapm (struct device *dev,struct sdca_function_data *function,struct snd_soc_dapm_widget *widgets,struct snd_soc_dapm_route *routes); +int sdca_asoc_populate_controls (struct device *dev, +struct sdca_function_data *function, +struct snd_kcontrol_new *kctl); int sdca_asoc_populate_component(struct device *dev, struct sdca_function_data *function,
include/sound/sdca_function.h +10 -0
@@ -206,6 +206,16 @@ enum sdca_fu_controls { SDCA_CTL_FU_LATENCY = 0x10, }; +/** +* enum sdca_volume_range - Column definitions for Q7.8dB volumes/gains +*/ +enum sdca_volume_range { +SDCA_VOLUME_LINEAR_MIN =0 , +SDCA_VOLUME_LINEAR_MAX =1 , +SDCA_VOLUME_LINEAR_STEP =2 , +SDCA_VOLUME_LINEAR_NCOLS =3 , +}; +/** * enum sdca_xu_controls - SDCA Controls for Extension Unit *
sound/soc/sdca/sdca_asoc.c +237 -4
309 lines not on this page · raw message
Signature · 1 line
2.39.5
Charles Keepax
maintainerPATCH v4 5/5 ASoC: SDCA: Create DAI drivers from DisCo
In reply to Charles KeepaxUse the previously parsed DisCo information from ACPI to create the DAI drivers required to connect an SDCA Function into an ASoC soundcard.
Create DAI driver structures and populate the supported sample rates and sample widths into them based on the Input/Output Terminal and any attach Clock Source entities. More complex relationships with channels etc. will be added later as constraints as part of the DAI startup.
---
No changes since v3.
include/sound/sdca_asoc.h | 12 +- include/sound/sdca_function.h | 23 ++++ sound/soc/sdca/sdca_asoc.c | 226 +++++++++++++++++++++++++++++++++- 3 files changed, 255 insertions(+), 6 deletions(-)
include/sound/sdca_asoc.h +10 -2
@@ -14,11 +14,14 @@ struct device;struct sdca_function_data ;struct snd_kcontrol_new ;struct snd_soc_component_driver ; +struct snd_soc_dai_driver ; +struct snd_soc_dai_ops ;struct snd_soc_dapm_route ;struct snd_soc_dapm_widget ;int sdca_asoc_count_component (struct device *dev,struct sdca_function_data *function, -int *num_widgets,int *num_routes,int *num_controls); +int *num_widgets,int *num_routes,int *num_controls, +int *num_dais); int sdca_asoc_populate_dapm(struct device *dev, struct sdca_function_data *function, struct snd_soc_dapm_widget *widgets,
@@ -26,9 +29,14 @@ int sdca_asoc_populate_dapm(struct device *dev, struct sdca_function_data *functint sdca_asoc_populate_controls (struct device *dev,struct sdca_function_data *function,struct snd_kcontrol_new *kctl); +int sdca_asoc_populate_dais (struct device *dev,struct sdca_function_data *function, +struct snd_soc_dai_driver *dais, +const struct snd_soc_dai_ops *ops);int sdca_asoc_populate_component (struct device *dev,struct sdca_function_data *function, -struct snd_soc_component_driver *component_drv); +struct snd_soc_component_driver *component_drv, +struct snd_soc_dai_driver **dai_drv,int *num_dai_drv, +const struct snd_soc_dai_ops *ops);#endif // __SDCA_ASOC_H__
include/sound/sdca_function.h +23 -0
@@ -168,6 +168,20 @@ enum sdca_ot_controls { SDCA_CTL_OT_NDAI_PACKETTYPE = 0x17, }; +/** +* enum sdca_usage_range - Column definitions for Usage +*/ +enum sdca_usage_range { +SDCA_USAGE_NUMBER =0 , +SDCA_USAGE_CBN =1 , +SDCA_USAGE_SAMPLE_RATE =2 , +SDCA_USAGE_SAMPLE_WIDTH =3 , +SDCA_USAGE_FULL_SCALE =4 , +SDCA_USAGE_NOISE_FLOOR =5 , +SDCA_USAGE_TAG =6 , +SDCA_USAGE_NCOLS =7 , +}; +/** * enum sdca_mu_controls - SDCA Controls for Mixer Unit *
@@ -246,6 +260,15 @@ enum sdca_cs_controls { SDCA_CTL_CS_SAMPLERATEINDEX = 0x10, }; +/** +* enum sdca_samplerateindex_range - Column definitions for SampleRateIndex +*/ +enum sdca_samplerateindex_range { +SDCA_SAMPLERATEINDEX_INDEX =0 , +SDCA_SAMPLERATEINDEX_RATE =1 , +SDCA_SAMPLERATEINDEX_NCOLS =2 , +}; +/** * enum sdca_cx_controls - SDCA Controls for Clock Selector *
sound/soc/sdca/sdca_asoc.c +222 -4
287 lines not on this page · raw message
Signature · 1 line
2.39.5