Unverified Commit 37d69839 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: dmaengine_pcm: Allow passing component name via config 

Merge series from Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>:

At the moment we cannot instantiate two dmaengine_pcms with the same
parent device, as the components will be named the same, leading to
conflicts.

Add 'name' field to the snd_dmaengine_pcm_config, and use that (if
defined) as the component name instead of deriving the component name
from the device.
parents d7e6a980 cee28113

include/sound/dmaengine_pcm.h

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ int snd_dmaengine_pcm_refine_runtime_hwparams( 
 *   which do not use devicetree.

 * @process: Callback used to apply processing on samples transferred from/to

 *   user space.

 * @name: Component name. If null, dev_name will be used.

 * @compat_filter_fn: Will be used as the filter function when requesting a

 *  channel for platforms which do not use devicetree. The filter parameter

 *  will be the DAI's DMA data.
@@ -143,6 +144,7 @@ struct snd_dmaengine_pcm_config { 
	int (*process)(struct snd_pcm_substream *substream,

		       int channel, unsigned long hwoff,

		       unsigned long bytes);

	const char *name;

	dma_filter_fn compat_filter_fn;

	struct device *dma_dev;

	const char *chan_names[SNDRV_PCM_STREAM_LAST + 1];

sound/soc/soc-core.c

+5 −3
Original line number Diff line number Diff line
@@ -2796,11 +2796,13 @@ int snd_soc_component_initialize(struct snd_soc_component *component, 
	INIT_LIST_HEAD(&component->list);

	mutex_init(&component->io_mutex);



	if (!component->name) {

		component->name = fmt_single_name(dev, &component->id);

		if (!component->name) {

			dev_err(dev, "ASoC: Failed to allocate name\n");

			return -ENOMEM;

		}

	}



	component->dev		= dev;

	component->driver	= driver;

sound/soc/soc-generic-dmaengine-pcm.c

+3 −0
Original line number Diff line number Diff line
@@ -441,6 +441,9 @@ int snd_dmaengine_pcm_register(struct device *dev, 
	pcm->config = config;

	pcm->flags = flags;



	if (config->name)

		pcm->component.name = config->name;



	ret = dmaengine_pcm_request_chan_of(pcm, dev, config);

	if (ret)

		goto err_free_dma;