Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next (14eec477) · Commits · e / devices / android_kernel_oneplus_sm7250

include/sound/dmaengine_pcm.h

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,6 @@ struct dma_chan snd_dmaengine_pcm_get_chan(struct snd_pcm_substream substream)
	* @slave_id: Slave requester id for the DMA channel.		* @slave_id: Slave requester id for the DMA channel.
	* @filter_data: Custom DMA channel filter data, this will usually be used when		* @filter_data: Custom DMA channel filter data, this will usually be used when
	* requesting the DMA channel.		* requesting the DMA channel.
	* @chan_name: Custom channel name to use when requesting DMA channel.
	* @fifo_size: FIFO size of the DAI controller in bytes		* @fifo_size: FIFO size of the DAI controller in bytes
	* @flags: PCM_DAI flags, only SND_DMAENGINE_PCM_DAI_FLAG_PACK for now		* @flags: PCM_DAI flags, only SND_DMAENGINE_PCM_DAI_FLAG_PACK for now
	*/		*/
	@@ -81,7 +80,6 @@ struct snd_dmaengine_dai_dma_data {
	u32 maxburst;		u32 maxburst;
	unsigned int slave_id;		unsigned int slave_id;
	void *filter_data;		void *filter_data;
	const char *chan_name;
	unsigned int fifo_size;		unsigned int fifo_size;
	unsigned int flags;		unsigned int flags;
	};		};
	@@ -107,10 +105,6 @@ void snd_dmaengine_pcm_set_config_from_dai_data(
	* playback.		* playback.
	*/		*/
	#define SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX BIT(3)		#define SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX BIT(3)
	/*
	* The PCM streams have custom channel names specified.
	*/
	#define SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME BIT(4)

	/**		/**
	* struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM		* struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM

sound/soc/samsung/dmaengine.c

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -37,12 +37,8 @@ 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

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1304,8 +1304,6 @@ 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;
	@@ -1330,7 +1328,6 @@ 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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -35,12 +35,10 @@
	#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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -33,12 +33,10 @@
	#include <linux/platform_data/asoc-s3c.h>		#include <linux/platform_data/asoc-s3c.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,
	};		};