Commit 8ef2292e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/spdif' into asoc-next

parents 30901860 fc606148

sound/soc/codecs/spdif_receiver.c

+16 −1
Original line number Diff line number Diff line
@@ -23,11 +23,26 @@ 
#include <sound/initval.h>

#include <linux/of.h>



static const struct snd_soc_dapm_widget dir_widgets[] = {

	SND_SOC_DAPM_INPUT("spdif-in"),

};



static const struct snd_soc_dapm_route dir_routes[] = {

	{ "Capture", NULL, "spdif-in" },

};



#define STUB_RATES	SNDRV_PCM_RATE_8000_192000

#define STUB_FORMATS	(SNDRV_PCM_FMTBIT_S16_LE | \

			SNDRV_PCM_FMTBIT_S20_3LE | \

			SNDRV_PCM_FMTBIT_S24_LE | \

			SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE)



static struct snd_soc_codec_driver soc_codec_spdif_dir;

static struct snd_soc_codec_driver soc_codec_spdif_dir = {

	.dapm_widgets = dir_widgets,

	.num_dapm_widgets = ARRAY_SIZE(dir_widgets),

	.dapm_routes = dir_routes,

	.num_dapm_routes = ARRAY_SIZE(dir_routes),

};



static struct snd_soc_dai_driver dir_stub_dai = {

	.name		= "dir-hifi",

sound/soc/codecs/spdif_transmitter.c

+16 −2
Original line number Diff line number Diff line
@@ -25,10 +25,24 @@ 
#define DRV_NAME "spdif-dit"



#define STUB_RATES	SNDRV_PCM_RATE_8000_96000

#define STUB_FORMATS	SNDRV_PCM_FMTBIT_S16_LE

#define STUB_FORMATS	(SNDRV_PCM_FMTBIT_S16_LE | \

			SNDRV_PCM_FMTBIT_S20_3LE | \

			SNDRV_PCM_FMTBIT_S24_LE)



static const struct snd_soc_dapm_widget dit_widgets[] = {

	SND_SOC_DAPM_OUTPUT("spdif-out"),

};



static const struct snd_soc_dapm_route dit_routes[] = {

	{ "spdif-out", NULL, "Playback" },

};



static struct snd_soc_codec_driver soc_codec_spdif_dit;

static struct snd_soc_codec_driver soc_codec_spdif_dit = {

	.dapm_widgets = dit_widgets,

	.num_dapm_widgets = ARRAY_SIZE(dit_widgets),

	.dapm_routes = dit_routes,

	.num_dapm_routes = ARRAY_SIZE(dit_routes),

};



static struct snd_soc_dai_driver dit_stub_dai = {

	.name		= "dit-hifi",