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

Merge remote-tracking branches 'asoc/topic/fsi', 'asoc/topic/fsl',... 

Merge remote-tracking branches 'asoc/topic/fsi', 'asoc/topic/fsl', 'asoc/topic/fsl-asrc', 'asoc/topic/fsl-card' and 'asoc/topic/fsl-sai' into asoc-next
parents 7c003136 be9ae230 dcfcf2c2 fa3be920 50e0ee01 9b7493d0

sound/soc/fsl/eukrea-tlv320.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) 
		);

	} else {

		if (np) {

			/* The eukrea,asoc-tlv320 driver was explicitely

			/* The eukrea,asoc-tlv320 driver was explicitly

			 * requested (through the device tree).

			 */

			dev_err(&pdev->dev,

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

+14 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include "../codecs/sgtl5000.h"

#include "../codecs/wm8962.h"

#include "../codecs/wm8960.h"



#define RX 0

#define TX 1
@@ -407,6 +408,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	struct fsl_asoc_card_priv *priv;

	struct i2c_client *codec_dev;

	struct clk *codec_clk;

	const char *codec_dai_name;

	u32 width;

	int ret;
@@ -459,6 +461,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 


	/* Diversify the card configurations */

	if (of_device_is_compatible(np, "fsl,imx-audio-cs42888")) {

		codec_dai_name = "cs42888";

		priv->card.set_bias_level = NULL;

		priv->cpu_priv.sysclk_freq[TX] = priv->codec_priv.mclk_freq;

		priv->cpu_priv.sysclk_freq[RX] = priv->codec_priv.mclk_freq;
@@ -467,14 +470,22 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
		priv->cpu_priv.slot_width = 32;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;

	} else if (of_device_is_compatible(np, "fsl,imx-audio-sgtl5000")) {

		codec_dai_name = "sgtl5000";

		priv->codec_priv.mclk_id = SGTL5000_SYSCLK;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;

	} else if (of_device_is_compatible(np, "fsl,imx-audio-wm8962")) {

		codec_dai_name = "wm8962";

		priv->card.set_bias_level = fsl_asoc_card_set_bias_level;

		priv->codec_priv.mclk_id = WM8962_SYSCLK_MCLK;

		priv->codec_priv.fll_id = WM8962_SYSCLK_FLL;

		priv->codec_priv.pll_id = WM8962_FLL;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;

	} else if (of_device_is_compatible(np, "fsl,imx-audio-wm8960")) {

		codec_dai_name = "wm8960-hifi";

		priv->card.set_bias_level = fsl_asoc_card_set_bias_level;

		priv->codec_priv.fll_id = WM8960_SYSCLK_AUTO;

		priv->codec_priv.pll_id = WM8960_SYSCLK_AUTO;

		priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;

	} else {

		dev_err(&pdev->dev, "unknown Device Tree compatible\n");

		return -EINVAL;
@@ -521,7 +532,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	/* Normal DAI Link */

	priv->dai_link[0].cpu_of_node = cpu_np;

	priv->dai_link[0].codec_of_node = codec_np;

	priv->dai_link[0].codec_dai_name = codec_dev->name;

	priv->dai_link[0].codec_dai_name = codec_dai_name;

	priv->dai_link[0].platform_of_node = cpu_np;

	priv->dai_link[0].dai_fmt = priv->dai_fmt;

	priv->card.num_links = 1;
@@ -530,7 +541,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
		/* DPCM DAI Links only if ASRC exsits */

		priv->dai_link[1].cpu_of_node = asrc_np;

		priv->dai_link[1].platform_of_node = asrc_np;

		priv->dai_link[2].codec_dai_name = codec_dev->name;

		priv->dai_link[2].codec_dai_name = codec_dai_name;

		priv->dai_link[2].codec_of_node = codec_np;

		priv->dai_link[2].cpu_of_node = cpu_np;

		priv->dai_link[2].dai_fmt = priv->dai_fmt;
@@ -578,6 +589,7 @@ static const struct of_device_id fsl_asoc_card_dt_ids[] = { 
	{ .compatible = "fsl,imx-audio-cs42888", },

	{ .compatible = "fsl,imx-audio-sgtl5000", },

	{ .compatible = "fsl,imx-audio-wm8962", },

	{ .compatible = "fsl,imx-audio-wm8960", },

	{}

};

sound/soc/fsl/fsl_asrc.c

+20 −5
Original line number Diff line number Diff line
@@ -931,14 +931,29 @@ static int fsl_asrc_probe(struct platform_device *pdev) 
static int fsl_asrc_runtime_resume(struct device *dev)

{

	struct fsl_asrc *asrc_priv = dev_get_drvdata(dev);

	int i;

	int i, ret;



	clk_prepare_enable(asrc_priv->mem_clk);

	clk_prepare_enable(asrc_priv->ipg_clk);

	for (i = 0; i < ASRC_CLK_MAX_NUM; i++)

		clk_prepare_enable(asrc_priv->asrck_clk[i]);

	ret = clk_prepare_enable(asrc_priv->mem_clk);

	if (ret)

		return ret;

	ret = clk_prepare_enable(asrc_priv->ipg_clk);

	if (ret)

		goto disable_mem_clk;

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

		ret = clk_prepare_enable(asrc_priv->asrck_clk[i]);

		if (ret)

			goto disable_asrck_clk;

	}



	return 0;



disable_asrck_clk:

	for (i--; i >= 0; i--)

		clk_disable_unprepare(asrc_priv->asrck_clk[i]);

	clk_disable_unprepare(asrc_priv->ipg_clk);

disable_mem_clk:

	clk_disable_unprepare(asrc_priv->mem_clk);

	return ret;

}



static int fsl_asrc_runtime_suspend(struct device *dev)

sound/soc/fsl/fsl_esai.c

+1 −1
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ static int fsl_esai_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = imx_pcm_dma_init(pdev);

	ret = imx_pcm_dma_init(pdev, IMX_ESAI_DMABUF_SIZE);

	if (ret)

		dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret);

sound/soc/fsl/fsl_sai.c

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ static int fsl_sai_probe(struct platform_device *pdev) 
		return ret;



	if (sai->sai_on_imx)

		return imx_pcm_dma_init(pdev);

		return imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE);

	else

		return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);

}