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

Unverified Commit 165879a9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/fsl_esai', 'asoc/topic/fsl_ssi',... 

Merge remote-tracking branches 'asoc/topic/fsl_esai', 'asoc/topic/fsl_ssi', 'asoc/topic/fsl_utils', 'asoc/topic/generic-dmaengine' and 'asoc/topic/gtm601' into asoc-next
parents 323a56ed 0600b3e1 9c4f509a cb3981b6 2e78a556 993709b8

include/sound/dmaengine_pcm.h

+5 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ void snd_dmaengine_pcm_set_config_from_dai_data( 
 *   PCM substream. Will be called from the PCM drivers hwparams callback.

 * @compat_request_channel: Callback to request a DMA channel for platforms

 *   which do not use devicetree.

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

 *   user space.

 * @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.
@@ -140,6 +142,9 @@ struct snd_dmaengine_pcm_config { 
	struct dma_chan *(*compat_request_channel)(

			struct snd_soc_pcm_runtime *rtd,

			struct snd_pcm_substream *substream);

	int (*process)(struct snd_pcm_substream *substream,

		       int channel, unsigned long hwoff,

		       void *buf, unsigned long bytes);

	dma_filter_fn compat_filter_fn;

	struct device *dma_dev;

	const char *chan_names[SNDRV_PCM_STREAM_LAST + 1];

include/uapi/sound/asound.h

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ typedef int __bitwise snd_pcm_format_t; 
#define	SNDRV_PCM_FORMAT_DSD_U16_BE	((__force snd_pcm_format_t) 51) /* DSD, 2-byte samples DSD (x16), big endian */

#define	SNDRV_PCM_FORMAT_DSD_U32_BE	((__force snd_pcm_format_t) 52) /* DSD, 4-byte samples DSD (x32), big endian */

#define	SNDRV_PCM_FORMAT_LAST		SNDRV_PCM_FORMAT_DSD_U32_BE

#define	SNDRV_PCM_FORMAT_FIRST		SNDRV_PCM_FORMAT_S8



#ifdef SNDRV_LITTLE_ENDIAN

#define	SNDRV_PCM_FORMAT_S16		SNDRV_PCM_FORMAT_S16_LE

sound/soc/codecs/gtm601.c

+11 −17
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/device.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/ac97_codec.h>

#include <sound/initval.h>

#include <sound/soc.h>
@@ -51,25 +50,21 @@ static struct snd_soc_dai_driver gtm601_dai = { 
	},

};



static const struct snd_soc_codec_driver soc_codec_dev_gtm601 = {

	.component_driver = {

static const struct snd_soc_component_driver soc_component_dev_gtm601 = {

	.dapm_widgets		= gtm601_dapm_widgets,

	.num_dapm_widgets	= ARRAY_SIZE(gtm601_dapm_widgets),

	.dapm_routes		= gtm601_dapm_routes,

	.num_dapm_routes	= ARRAY_SIZE(gtm601_dapm_routes),

	},

	.idle_bias_on		= 1,

	.use_pmdown_time	= 1,

	.endianness		= 1,

	.non_legacy_dai_naming	= 1,

};



static int gtm601_platform_probe(struct platform_device *pdev)

{

	return snd_soc_register_codec(&pdev->dev,

			&soc_codec_dev_gtm601, &gtm601_dai, 1);

}



static int gtm601_platform_remove(struct platform_device *pdev)

{

	snd_soc_unregister_codec(&pdev->dev);

	return 0;

	return devm_snd_soc_register_component(&pdev->dev,

			&soc_component_dev_gtm601, &gtm601_dai, 1);

}



#if defined(CONFIG_OF)
@@ -86,7 +81,6 @@ static struct platform_driver gtm601_codec_driver = { 
		.of_match_table = of_match_ptr(gtm601_codec_of_match),

	},

	.probe = gtm601_platform_probe,

	.remove = gtm601_platform_remove,

};



module_platform_driver(gtm601_codec_driver);

sound/soc/fsl/fsl_esai.c

+1 −1
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ static int fsl_esai_probe(struct platform_device *pdev) 
	struct device_node *np = pdev->dev.of_node;

	struct fsl_esai *esai_priv;

	struct resource *res;

	const uint32_t *iprop;

	const __be32 *iprop;

	void __iomem *regs;

	int irq, ret;