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

Commit b8ab0ccc authored Jan 17, 2017 by Sylwester Nawrocki Committed by Mark Brown Jan 23, 2017

ASoC: Revert "samsung: Remove unneeded initialization of chan_name"



This reverts commit cdaf9af1
which breaks I2S support on the non-DT Samsung SoC platforms,
since the default "tx", "rx" DMA channel names for playback
and capture streams or custom channel names in struct
snd_dmaengine_pcm_config are supported in the ASoC dmaengine
module only for devicetree booting case.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent a5de5b74

sound/soc/samsung/dmaengine.c

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -37,8 +37,12 @@ int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter,
	pcm_conf->prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;		pcm_conf->prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config;
	pcm_conf->compat_filter_fn = filter;		pcm_conf->compat_filter_fn = filter;

			if (dev->of_node) {
	pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx;		pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx;
	pcm_conf->chan_names[SNDRV_PCM_STREAM_CAPTURE] = rx;		pcm_conf->chan_names[SNDRV_PCM_STREAM_CAPTURE] = rx;
			} else {
			flags \|= SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME;
			}

	return devm_snd_dmaengine_pcm_register(dev, pcm_conf, flags);		return devm_snd_dmaengine_pcm_register(dev, pcm_conf, flags);
	}		}

sound/soc/samsung/i2s.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1305,6 +1305,8 @@ static int samsung_i2s_probe(struct platform_device *pdev)
	}		}
	pri_dai->dma_playback.addr = regs_base + I2STXD;		pri_dai->dma_playback.addr = regs_base + I2STXD;
	pri_dai->dma_capture.addr = regs_base + I2SRXD;		pri_dai->dma_capture.addr = regs_base + I2SRXD;
			pri_dai->dma_playback.chan_name = "tx";
			pri_dai->dma_capture.chan_name = "rx";
	pri_dai->dma_playback.addr_width = 4;		pri_dai->dma_playback.addr_width = 4;
	pri_dai->dma_capture.addr_width = 4;		pri_dai->dma_capture.addr_width = 4;
	pri_dai->quirks = quirks;		pri_dai->quirks = quirks;
	@@ -1329,6 +1331,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
	sec_dai->lock = &pri_dai->spinlock;		sec_dai->lock = &pri_dai->spinlock;
	sec_dai->variant_regs = pri_dai->variant_regs;		sec_dai->variant_regs = pri_dai->variant_regs;
	sec_dai->dma_playback.addr = regs_base + I2STXDS;		sec_dai->dma_playback.addr = regs_base + I2STXDS;
			sec_dai->dma_playback.chan_name = "tx-sec";

	if (!np) {		if (!np) {
	sec_dai->dma_playback.filter_data = i2s_pdata->dma_play_sec;		sec_dai->dma_playback.filter_data = i2s_pdata->dma_play_sec;

sound/soc/samsung/s3c2412-i2s.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,10 +35,12 @@
	#include <linux/platform_data/asoc-s3c.h>		#include <linux/platform_data/asoc-s3c.h>

	static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_out = {		static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_out = {
			.chan_name = "tx",
	.addr_width = 4,		.addr_width = 4,
	};		};

	static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_in = {		static struct snd_dmaengine_dai_dma_data s3c2412_i2s_pcm_stereo_in = {
			.chan_name = "rx",
	.addr_width = 4,		.addr_width = 4,
	};		};

sound/soc/samsung/s3c24xx-i2s.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,10 +31,12 @@
	#include "s3c24xx-i2s.h"		#include "s3c24xx-i2s.h"

	static struct snd_dmaengine_dai_dma_data s3c24xx_i2s_pcm_stereo_out = {		static struct snd_dmaengine_dai_dma_data s3c24xx_i2s_pcm_stereo_out = {
			.chan_name = "tx",
	.addr_width = 2,		.addr_width = 2,
	};		};

	static struct snd_dmaengine_dai_dma_data s3c24xx_i2s_pcm_stereo_in = {		static struct snd_dmaengine_dai_dma_data s3c24xx_i2s_pcm_stereo_in = {
			.chan_name = "rx",
	.addr_width = 2,		.addr_width = 2,
	};		};