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

Commit 915b2c75 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/fsl' of... 

Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sgtl5000
parents 2bdc1bb2 dbdf6b54

sound/soc/fsl/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -108,18 +108,13 @@ if SND_IMX_SOC 
config SND_SOC_IMX_SSI

	tristate



config SND_SOC_IMX_PCM

	tristate



config SND_SOC_IMX_PCM_FIQ

	bool

	select FIQ

	select SND_SOC_IMX_PCM



config SND_SOC_IMX_PCM_DMA

	bool

	select SND_SOC_GENERIC_DMAENGINE_PCM

	select SND_SOC_IMX_PCM



config SND_SOC_IMX_AUDMUX

	tristate

sound/soc/fsl/Makefile

+2 −9
Original line number Diff line number Diff line
@@ -30,18 +30,11 @@ obj-$(CONFIG_SND_MPC52xx_SOC_EFIKA) += efika-audio-fabric.o 
# i.MX Platform Support

snd-soc-imx-ssi-objs := imx-ssi.o

snd-soc-imx-audmux-objs := imx-audmux.o

snd-soc-imx-pcm-objs := imx-pcm.o

ifneq ($(CONFIG_SND_SOC_IMX_PCM_FIQ),)

	snd-soc-imx-pcm-objs += imx-pcm-fiq.o

endif

ifneq ($(CONFIG_SND_SOC_IMX_PCM_DMA),)

	snd-soc-imx-pcm-objs += imx-pcm-dma.o

endif



obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o

obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o



obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o

obj-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += imx-pcm-fiq.o

obj-$(CONFIG_SND_SOC_IMX_PCM_DMA) += imx-pcm-dma.o



# i.MX Machine Support

snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o

sound/soc/fsl/eukrea-tlv320.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { 
	.name		= "tlv320aic23",

	.stream_name	= "TLV320AIC23",

	.codec_dai_name	= "tlv320aic23-hifi",

	.platform_name	= "imx-fiq-pcm-audio.0",

	.platform_name	= "imx-ssi.0",

	.codec_name	= "tlv320aic23-codec.0-001a",

	.cpu_dai_name	= "imx-ssi.0",

	.ops		= &eukrea_tlv320_snd_ops,

sound/soc/fsl/fsl_ssi.c

+4 −9
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ struct fsl_ssi_private { 
	bool new_binding;

	bool ssi_on_imx;

	struct clk *clk;

	struct platform_device *imx_pcm_pdev;

	struct snd_dmaengine_dai_dma_data dma_params_tx;

	struct snd_dmaengine_dai_dma_data dma_params_rx;

	struct imx_dma_data filter_data_tx;
@@ -809,14 +808,10 @@ static int fsl_ssi_probe(struct platform_device *pdev) 
	}



	if (ssi_private->ssi_on_imx) {

		ssi_private->imx_pcm_pdev =

			platform_device_register_simple("imx-pcm-audio",

							-1, NULL, 0);

		if (IS_ERR(ssi_private->imx_pcm_pdev)) {

			ret = PTR_ERR(ssi_private->imx_pcm_pdev);

		ret = imx_pcm_dma_init(pdev);

		if (ret)

			goto error_dev;

	}

	}



	/*

	 * If codec-handle property is missing from SSI node, we assume
@@ -854,7 +849,7 @@ done: 


error_dai:

	if (ssi_private->ssi_on_imx)

		platform_device_unregister(ssi_private->imx_pcm_pdev);

		imx_pcm_dma_exit(pdev);

	snd_soc_unregister_component(&pdev->dev);



error_dev:
@@ -889,7 +884,7 @@ static int fsl_ssi_remove(struct platform_device *pdev) 
	if (!ssi_private->new_binding)

		platform_device_unregister(ssi_private->pdev);

	if (ssi_private->ssi_on_imx) {

		platform_device_unregister(ssi_private->imx_pcm_pdev);

		imx_pcm_dma_exit(pdev);

		clk_disable_unprepare(ssi_private->clk);

		clk_put(ssi_private->clk);

	}

sound/soc/fsl/imx-audmux.c

+0 −8
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/pinctrl/consumer.h>



#include "imx-audmux.h"
@@ -247,7 +246,6 @@ EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port); 
static int imx_audmux_probe(struct platform_device *pdev)

{

	struct resource *res;

	struct pinctrl *pinctrl;

	const struct of_device_id *of_id =

			of_match_device(imx_audmux_dt_ids, &pdev->dev);
@@ -256,12 +254,6 @@ static int imx_audmux_probe(struct platform_device *pdev) 
	if (IS_ERR(audmux_base))

		return PTR_ERR(audmux_base);



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		dev_err(&pdev->dev, "setup pinctrl failed!");

		return PTR_ERR(pinctrl);

	}



	audmux_clk = devm_clk_get(&pdev->dev, "audmux");

	if (IS_ERR(audmux_clk)) {

		dev_dbg(&pdev->dev, "cannot get clock: %ld\n",