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

Commit 389cb834 authored by Jyri Sarha's avatar Jyri Sarha Committed by Mark Brown
Browse files

ASoC: core: Update snd_soc_of_parse_daifmt() interface 



Adds struct device_node **bitclkmaster and struct device_node **framemaster
function parameters. With the new syntax bitclock-master and frame-master
properties can explicitly indicate the dai-link bit-clock and frame masters
with a phandle. This patch also makes the minimal changes to simple-card
for it to work with the updated snd_soc_of_parse_daifmt(). Simple-card appears
to be the only user of snd_soc_of_parse_daifmt() for now.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Acked-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent c9eaa447

include/sound/soc.h

+3 −1
Original line number Diff line number Diff line
@@ -1241,7 +1241,9 @@ int snd_soc_of_parse_tdm_slot(struct device_node *np, 
int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,

				   const char *propname);

unsigned int snd_soc_of_parse_daifmt(struct device_node *np,

				     const char *prefix);

				     const char *prefix,

				     struct device_node **bitclkmaster,

				     struct device_node **framemaster);

int snd_soc_of_get_dai_name(struct device_node *of_node,

			    const char **dai_name);

sound/soc/generic/simple-card.c

+3 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np, 
	 * bitclock-master,    frame-master

	 * and specific "format" if it has

	 */

	dai->fmt = snd_soc_of_parse_daifmt(np, NULL);

	dai->fmt = snd_soc_of_parse_daifmt(np, NULL, NULL, NULL);

	dai->fmt |= daifmt;



	/*
@@ -201,7 +201,8 @@ static int asoc_simple_card_parse_of(struct device_node *node, 
	snd_soc_of_parse_card_name(&priv->snd_card, "simple-audio-card,name");



	/* get CPU/CODEC common format via simple-audio-card,format */

	daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &

	daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,", NULL,

					 NULL) &

		(SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);



	/* off-codec widgets */

sound/soc/soc-core.c

+7 −1
Original line number Diff line number Diff line
@@ -4554,7 +4554,9 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, 
EXPORT_SYMBOL_GPL(snd_soc_of_parse_audio_routing);



unsigned int snd_soc_of_parse_daifmt(struct device_node *np,

				     const char *prefix)

				     const char *prefix,

				     struct device_node **bitclkmaster,

				     struct device_node **framemaster)

{

	int ret, i;

	char prop[128];
@@ -4637,9 +4639,13 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np, 
	 */

	snprintf(prop, sizeof(prop), "%sbitclock-master", prefix);

	bit = !!of_get_property(np, prop, NULL);

	if (bit && bitclkmaster)

		*bitclkmaster = of_parse_phandle(np, prop, 0);



	snprintf(prop, sizeof(prop), "%sframe-master", prefix);

	frame = !!of_get_property(np, prop, NULL);

	if (frame && framemaster)

		*framemaster = of_parse_phandle(np, prop, 0);



	switch ((bit << 4) + frame) {

	case 0x11: