Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit cbdfab3b authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown
Browse files

ASoC: export snd_soc_of_get_slot_mask 



Amlogic's axg card driver can't use snd_soc_of_parse_tdm_slot()
directly because it needs to handle 4 mask for each direction.
Yet the parsing of each mask is the same, so export
snd_soc_of_get_slot_mask() to reuse the the existing code.

Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 13a22e6a

include/sound/soc.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -1433,6 +1433,9 @@ int snd_soc_of_parse_card_name(struct snd_soc_card *card, 
			       const char *propname);

			       const char *propname);

int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,

int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,

					  const char *propname);

					  const char *propname);

int snd_soc_of_get_slot_mask(struct device_node *np,

			     const char *prop_name,

			     unsigned int *mask);

int snd_soc_of_parse_tdm_slot(struct device_node *np,

int snd_soc_of_parse_tdm_slot(struct device_node *np,

			      unsigned int *tx_mask,

			      unsigned int *tx_mask,

			      unsigned int *rx_mask,

			      unsigned int *rx_mask,

sound/soc/soc-core.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -3428,7 +3428,7 @@ int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card, 
}

}

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_simple_widgets);

EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_simple_widgets);





static int snd_soc_of_get_slot_mask(struct device_node *np,

int snd_soc_of_get_slot_mask(struct device_node *np,

			     const char *prop_name,

			     const char *prop_name,

			     unsigned int *mask)

			     unsigned int *mask)

{

{
@@ -3445,6 +3445,7 @@ static int snd_soc_of_get_slot_mask(struct device_node *np, 




	return val;

	return val;

}

}

EXPORT_SYMBOL_GPL(snd_soc_of_get_slot_mask);





int snd_soc_of_parse_tdm_slot(struct device_node *np,

int snd_soc_of_parse_tdm_slot(struct device_node *np,

			      unsigned int *tx_mask,

			      unsigned int *tx_mask,