Unverified Commit 3d4641a4 authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Mark Brown
Browse files

ASoC: core: Add snd_soc_of_parse_pin_switches() from simple-card-utils 



The ASoC core already has several helpers to parse card properties
from the device tree. Move the parsing code for "pin-switches" from
simple-card-utils to a shared snd_soc_of_parse_pin_switches() function
so other drivers can also use it to set up pin switches configured in
the device tree.

Cc: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20211214142049.20422-2-stephan@gerhold.net


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8102d8cd

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -1211,6 +1211,7 @@ int snd_soc_of_parse_card_name(struct snd_soc_card *card, 
			       const char *propname);

int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,

					  const char *propname);

int snd_soc_of_parse_pin_switches(struct snd_soc_card *card, const char *prop);

int snd_soc_of_get_slot_mask(struct device_node *np,

			     const char *prop_name,

			     unsigned int *mask);

sound/soc/generic/simple-card-utils.c

+1 −44
Original line number Diff line number Diff line
@@ -499,57 +499,14 @@ EXPORT_SYMBOL_GPL(asoc_simple_parse_widgets); 
int asoc_simple_parse_pin_switches(struct snd_soc_card *card,

				   char *prefix)

{

	const unsigned int nb_controls_max = 16;

	const char **strings, *control_name;

	struct snd_kcontrol_new *controls;

	struct device *dev = card->dev;

	unsigned int i, nb_controls;

	char prop[128];

	int ret;



	if (!prefix)

		prefix = "";



	snprintf(prop, sizeof(prop), "%s%s", prefix, "pin-switches");



	if (!of_property_read_bool(dev->of_node, prop))

		return 0;



	strings = devm_kcalloc(dev, nb_controls_max,

			       sizeof(*strings), GFP_KERNEL);

	if (!strings)

		return -ENOMEM;



	ret = of_property_read_string_array(dev->of_node, prop,

					    strings, nb_controls_max);

	if (ret < 0)

		return ret;



	nb_controls = (unsigned int)ret;



	controls = devm_kcalloc(dev, nb_controls,

				sizeof(*controls), GFP_KERNEL);

	if (!controls)

		return -ENOMEM;



	for (i = 0; i < nb_controls; i++) {

		control_name = devm_kasprintf(dev, GFP_KERNEL,

					      "%s Switch", strings[i]);

		if (!control_name)

			return -ENOMEM;



		controls[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER;

		controls[i].name = control_name;

		controls[i].info = snd_soc_dapm_info_pin_switch;

		controls[i].get = snd_soc_dapm_get_pin_switch;

		controls[i].put = snd_soc_dapm_put_pin_switch;

		controls[i].private_value = (unsigned long)strings[i];

	}



	card->controls = controls;

	card->num_controls = nb_controls;



	return 0;

	return snd_soc_of_parse_pin_switches(card, prop);

}

EXPORT_SYMBOL_GPL(asoc_simple_parse_pin_switches);

sound/soc/soc-core.c

+50 −0
Original line number Diff line number Diff line
@@ -2823,6 +2823,56 @@ int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card, 
}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_simple_widgets);



int snd_soc_of_parse_pin_switches(struct snd_soc_card *card, const char *prop)

{

	const unsigned int nb_controls_max = 16;

	const char **strings, *control_name;

	struct snd_kcontrol_new *controls;

	struct device *dev = card->dev;

	unsigned int i, nb_controls;

	int ret;



	if (!of_property_read_bool(dev->of_node, prop))

		return 0;



	strings = devm_kcalloc(dev, nb_controls_max,

			       sizeof(*strings), GFP_KERNEL);

	if (!strings)

		return -ENOMEM;



	ret = of_property_read_string_array(dev->of_node, prop,

					    strings, nb_controls_max);

	if (ret < 0)

		return ret;



	nb_controls = (unsigned int)ret;



	controls = devm_kcalloc(dev, nb_controls,

				sizeof(*controls), GFP_KERNEL);

	if (!controls)

		return -ENOMEM;



	for (i = 0; i < nb_controls; i++) {

		control_name = devm_kasprintf(dev, GFP_KERNEL,

					      "%s Switch", strings[i]);

		if (!control_name)

			return -ENOMEM;



		controls[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER;

		controls[i].name = control_name;

		controls[i].info = snd_soc_dapm_info_pin_switch;

		controls[i].get = snd_soc_dapm_get_pin_switch;

		controls[i].put = snd_soc_dapm_put_pin_switch;

		controls[i].private_value = (unsigned long)strings[i];

	}



	card->controls = controls;

	card->num_controls = nb_controls;



	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_pin_switches);



int snd_soc_of_get_slot_mask(struct device_node *np,

			     const char *prop_name,

			     unsigned int *mask)