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

Commit 0efd7248 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/simple' of... 

Merge branch 'topic/simple' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rcar
parents cc9bdcf2 3527d85b

include/sound/simple_card.h

+1 −10
Original line number Diff line number Diff line
@@ -13,16 +13,7 @@ 
#define __SIMPLE_CARD_H



#include <sound/soc.h>



struct asoc_simple_dai {

	const char *name;

	unsigned int sysclk;

	int slots;

	int slot_width;

	unsigned int tx_slot_mask;

	unsigned int rx_slot_mask;

	struct clk *clk;

};

#include <sound/simple_card_utils.h>



struct asoc_simple_card_info {

	const char *name;

include/sound/simple_card_utils.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * simple_card_core.h

 *

 * Copyright (c) 2016 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#ifndef __SIMPLE_CARD_CORE_H

#define __SIMPLE_CARD_CORE_H



#include <sound/soc.h>



struct asoc_simple_dai {

	const char *name;

	unsigned int sysclk;

	int slots;

	int slot_width;

	unsigned int tx_slot_mask;

	unsigned int rx_slot_mask;

	struct clk *clk;

};



int asoc_simple_card_parse_daifmt(struct device *dev,

				  struct device_node *node,

				  struct device_node *codec,

				  char *prefix,

				  unsigned int *retfmt);

int asoc_simple_card_set_dailink_name(struct device *dev,

				      struct snd_soc_dai_link *dai_link,

				      const char *fmt, ...);

int asoc_simple_card_parse_card_name(struct snd_soc_card *card,

				     char *prefix);



#endif /* __SIMPLE_CARD_CORE_H */

sound/soc/generic/Kconfig

+4 −0
Original line number Diff line number Diff line 
config SND_SIMPLE_CARD_UTILS

       tristate



config SND_SIMPLE_CARD

	tristate "ASoC Simple sound card support"

	select SND_SIMPLE_CARD_UTILS

	help

	  This option enables generic simple sound card support

sound/soc/generic/Makefile

+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_SND_SIMPLE_CARD_UTILS) := simple-card-utils.o



snd-soc-simple-card-objs	:= simple-card.o



obj-$(CONFIG_SND_SIMPLE_CARD)	+= snd-soc-simple-card.o

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

0 → 100644
+97 −0
Original line number Diff line number Diff line 
/*

 * simple-card-core.c

 *

 * Copyright (c) 2016 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/of.h>

#include <sound/simple_card_utils.h>



int asoc_simple_card_parse_daifmt(struct device *dev,

				  struct device_node *node,

				  struct device_node *codec,

				  char *prefix,

				  unsigned int *retfmt)

{

	struct device_node *bitclkmaster = NULL;

	struct device_node *framemaster = NULL;

	int prefix_len = prefix ? strlen(prefix) : 0;

	unsigned int daifmt;



	daifmt = snd_soc_of_parse_daifmt(node, prefix,

					 &bitclkmaster, &framemaster);

	daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK;



	if (prefix_len && !bitclkmaster && !framemaster) {

		/*

		 * No dai-link level and master setting was not found from

		 * sound node level, revert back to legacy DT parsing and

		 * take the settings from codec node.

		 */

		dev_dbg(dev, "Revert to legacy daifmt parsing\n");



		daifmt = snd_soc_of_parse_daifmt(codec, NULL, NULL, NULL) |

			(daifmt & ~SND_SOC_DAIFMT_CLOCK_MASK);

	} else {

		if (codec == bitclkmaster)

			daifmt |= (codec == framemaster) ?

				SND_SOC_DAIFMT_CBM_CFM : SND_SOC_DAIFMT_CBM_CFS;

		else

			daifmt |= (codec == framemaster) ?

				SND_SOC_DAIFMT_CBS_CFM : SND_SOC_DAIFMT_CBS_CFS;

	}



	of_node_put(bitclkmaster);

	of_node_put(framemaster);



	*retfmt = daifmt;



	return 0;

}

EXPORT_SYMBOL_GPL(asoc_simple_card_parse_daifmt);



int asoc_simple_card_set_dailink_name(struct device *dev,

				      struct snd_soc_dai_link *dai_link,

				      const char *fmt, ...)

{

	va_list ap;

	char *name = NULL;

	int ret = -ENOMEM;



	va_start(ap, fmt);

	name = devm_kvasprintf(dev, GFP_KERNEL, fmt, ap);

	va_end(ap);



	if (name) {

		ret = 0;



		dai_link->name		= name;

		dai_link->stream_name	= name;

	}



	return ret;

}

EXPORT_SYMBOL_GPL(asoc_simple_card_set_dailink_name);



int asoc_simple_card_parse_card_name(struct snd_soc_card *card,

				     char *prefix)

{

	char prop[128];

	int ret;



	snprintf(prop, sizeof(prop), "%sname", prefix);



	/* Parse the card name from DT */

	ret = snd_soc_of_parse_card_name(card, prop);

	if (ret < 0)

		return ret;



	if (!card->name && card->dai_link)

		card->name = card->dai_link->name;



	return 0;

}

EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_name);