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

Commit a93202fa authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/pcm-list' into asoc-next

parents 3b88210d 61b0088b

include/sound/soc.h

+22 −3
Original line number Diff line number Diff line
@@ -1040,6 +1040,9 @@ struct snd_soc_dai_link { 


	/* pmdown_time is ignored at stop */

	unsigned int ignore_pmdown_time:1;



	struct list_head list; /* DAI link list of the soc card */

	struct snd_soc_dobj dobj; /* For topology */

};



struct snd_soc_codec_conf {
@@ -1104,12 +1107,20 @@ struct snd_soc_card { 
				   struct snd_soc_dapm_context *dapm,

				   enum snd_soc_bias_level level);



	int (*add_dai_link)(struct snd_soc_card *,

			    struct snd_soc_dai_link *link);

	void (*remove_dai_link)(struct snd_soc_card *,

			    struct snd_soc_dai_link *link);



	long pmdown_time;



	/* CPU <--> Codec DAI links  */

	struct snd_soc_dai_link *dai_link;

	int num_links;

	struct snd_soc_pcm_runtime *rtd;

	struct snd_soc_dai_link *dai_link;  /* predefined links only */

	int num_links;  /* predefined links only */

	struct list_head dai_link_list; /* all links */

	int num_dai_links;



	struct list_head rtd_list;

	int num_rtd;



	/* optional codec specific configuration */
@@ -1204,6 +1215,9 @@ struct snd_soc_pcm_runtime { 
	struct dentry *debugfs_dpcm_root;

	struct dentry *debugfs_dpcm_state;

#endif



	unsigned int num; /* 0-based and monotonic increasing */

	struct list_head list; /* rtd list of the soc card */

};



/* mixer control */
@@ -1647,6 +1661,11 @@ int snd_soc_of_get_dai_link_codecs(struct device *dev, 
				   struct device_node *of_node,

				   struct snd_soc_dai_link *dai_link);



int snd_soc_add_dai_link(struct snd_soc_card *card,

				struct snd_soc_dai_link *dai_link);

void snd_soc_remove_dai_link(struct snd_soc_card *card,

			     struct snd_soc_dai_link *dai_link);



#include <sound/soc-dai.h>



#ifdef CONFIG_DEBUG_FS

sound/soc/fsl/fsl-asoc-card.c

+8 −3
Original line number Diff line number Diff line
@@ -222,12 +222,15 @@ static int fsl_asoc_card_set_bias_level(struct snd_soc_card *card, 
					enum snd_soc_bias_level level)

{

	struct fsl_asoc_card_priv *priv = snd_soc_card_get_drvdata(card);

	struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;

	struct snd_soc_pcm_runtime *rtd;

	struct snd_soc_dai *codec_dai;

	struct codec_priv *codec_priv = &priv->codec_priv;

	struct device *dev = card->dev;

	unsigned int pll_out;

	int ret;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);

	codec_dai = rtd->codec_dai;

	if (dapm->dev != codec_dai->dev)

		return 0;
@@ -414,14 +417,16 @@ static int fsl_asoc_card_audmux_init(struct device_node *np, 
static int fsl_asoc_card_late_probe(struct snd_soc_card *card)

{

	struct fsl_asoc_card_priv *priv = snd_soc_card_get_drvdata(card);

	struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;

	struct snd_soc_pcm_runtime *rtd = list_first_entry(

			&card->rtd_list, struct snd_soc_pcm_runtime, list);

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct codec_priv *codec_priv = &priv->codec_priv;

	struct device *dev = card->dev;

	int ret;



	if (fsl_asoc_card_is_ac97(priv)) {

#if IS_ENABLED(CONFIG_SND_AC97_CODEC)

		struct snd_soc_codec *codec = card->rtd[0].codec;

		struct snd_soc_codec *codec = rtd->codec;

		struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);



		/*

sound/soc/fsl/imx-wm8962.c

+8 −2
Original line number Diff line number Diff line
@@ -69,13 +69,16 @@ static int imx_wm8962_set_bias_level(struct snd_soc_card *card, 
					struct snd_soc_dapm_context *dapm,

					enum snd_soc_bias_level level)

{

	struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;

	struct snd_soc_pcm_runtime *rtd;

	struct snd_soc_dai *codec_dai;

	struct imx_priv *priv = &card_priv;

	struct imx_wm8962_data *data = snd_soc_card_get_drvdata(card);

	struct device *dev = &priv->pdev->dev;

	unsigned int pll_out;

	int ret;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);

	codec_dai = rtd->codec_dai;

	if (dapm->dev != codec_dai->dev)

		return 0;
@@ -135,12 +138,15 @@ static int imx_wm8962_set_bias_level(struct snd_soc_card *card, 


static int imx_wm8962_late_probe(struct snd_soc_card *card)

{

	struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;

	struct snd_soc_pcm_runtime *rtd;

	struct snd_soc_dai *codec_dai;

	struct imx_priv *priv = &card_priv;

	struct imx_wm8962_data *data = snd_soc_card_get_drvdata(card);

	struct device *dev = &priv->pdev->dev;

	int ret;



	rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);

	codec_dai = rtd->codec_dai;

	ret = snd_soc_dai_set_sysclk(codec_dai, WM8962_SYSCLK_MCLK,

			data->clk_frequency, SND_SOC_CLOCK_IN);

	if (ret < 0)

sound/soc/generic/simple-card.c

+5 −7
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static int asoc_simple_card_startup(struct snd_pcm_substream *substream) 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct simple_card_data *priv =	snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props =

		&priv->dai_props[rtd - rtd->card->rtd];

		&priv->dai_props[rtd->num];

	int ret;



	ret = clk_prepare_enable(dai_props->cpu_dai.clk);
@@ -64,7 +64,7 @@ static void asoc_simple_card_shutdown(struct snd_pcm_substream *substream) 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct simple_card_data *priv =	snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props =

		&priv->dai_props[rtd - rtd->card->rtd];

		&priv->dai_props[rtd->num];



	clk_disable_unprepare(dai_props->cpu_dai.clk);
@@ -78,8 +78,7 @@ static int asoc_simple_card_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct simple_card_data *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props =

		&priv->dai_props[rtd - rtd->card->rtd];

	struct simple_dai_props *dai_props = &priv->dai_props[rtd->num];

	unsigned int mclk, mclk_fs = 0;

	int ret = 0;
@@ -174,10 +173,9 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) 
	struct snd_soc_dai *codec = rtd->codec_dai;

	struct snd_soc_dai *cpu = rtd->cpu_dai;

	struct simple_dai_props *dai_props;

	int num, ret;

	int ret;



	num = rtd - rtd->card->rtd;

	dai_props = &priv->dai_props[num];

	dai_props = &priv->dai_props[rtd->num];

	ret = __asoc_simple_card_dai_init(codec, &dai_props->codec_dai);

	if (ret < 0)

		return ret;

sound/soc/intel/atom/sst-mfld-platform-pcm.c

+6 −6
Original line number Diff line number Diff line
@@ -760,15 +760,15 @@ static int sst_platform_remove(struct platform_device *pdev) 
static int sst_soc_prepare(struct device *dev)

{

	struct sst_data *drv = dev_get_drvdata(dev);

	int i;

	struct snd_soc_pcm_runtime *rtd;



	/* suspend all pcms first */

	snd_soc_suspend(drv->soc_card->dev);

	snd_soc_poweroff(drv->soc_card->dev);



	/* set the SSPs to idle */

	for (i = 0; i < drv->soc_card->num_rtd; i++) {

		struct snd_soc_dai *dai = drv->soc_card->rtd[i].cpu_dai;

	list_for_each_entry(rtd, &drv->soc_card->rtd_list, list) {

		struct snd_soc_dai *dai = rtd->cpu_dai;



		if (dai->active) {

			send_ssp_cmd(dai, dai->name, 0);
@@ -782,11 +782,11 @@ static int sst_soc_prepare(struct device *dev) 
static void sst_soc_complete(struct device *dev)

{

	struct sst_data *drv = dev_get_drvdata(dev);

	int i;

	struct snd_soc_pcm_runtime *rtd;



	/* restart SSPs */

	for (i = 0; i < drv->soc_card->num_rtd; i++) {

		struct snd_soc_dai *dai = drv->soc_card->rtd[i].cpu_dai;

	list_for_each_entry(rtd, &drv->soc_card->rtd_list, list) {

		struct snd_soc_dai *dai = rtd->cpu_dai;



		if (dai->active) {

			sst_handle_vb_timer(dai, true);