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

Commit 33f503c9 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Use a shared define for AC97 CODEC data formats 



The AC97 wire format is completely fixed so CODECs don't have any choice
about the formats they accept but controllers accept a variety of data
formats and render them down onto the bus.  Have a shared define so all
the CODEC drivers will interoperate with any of our controller drivers.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 71437552

include/sound/soc-dai.h

+3 −0
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ struct snd_pcm_substream; 
#define SND_SOC_CLOCK_IN		0

#define SND_SOC_CLOCK_OUT		1



#define SND_SOC_STD_AC97_FMTS (SNDRV_PCM_FMTBIT_S16_LE |\

                               SNDRV_PCM_FMTBIT_S32_LE)



struct snd_soc_dai_ops;

struct snd_soc_dai;

struct snd_ac97_bus_ops;

sound/soc/codecs/ac97.c

+2 −2
Original line number Diff line number Diff line
@@ -53,13 +53,13 @@ struct snd_soc_dai ac97_dai = { 
		.channels_min = 1,

		.channels_max = 2,

		.rates = STD_AC97_RATES,

		.formats = SNDRV_PCM_FMTBIT_S16_LE,},

		.formats = SND_SOC_STD_AC97_FMTS,},

	.capture = {

		.stream_name = "AC97 Capture",

		.channels_min = 1,

		.channels_max = 2,

		.rates = STD_AC97_RATES,

		.formats = SNDRV_PCM_FMTBIT_S16_LE,},

		.formats = SND_SOC_STD_AC97_FMTS,},

	.ops = &ac97_dai_ops,

};

EXPORT_SYMBOL_GPL(ac97_dai);

sound/soc/codecs/ad1980.c

+2 −2
Original line number Diff line number Diff line
@@ -137,13 +137,13 @@ struct snd_soc_dai ad1980_dai = { 
		.channels_min = 2,

		.channels_max = 6,

		.rates = SNDRV_PCM_RATE_48000,

		.formats = SNDRV_PCM_FMTBIT_S16_LE, },

		.formats = SND_SOC_STD_AC97_FMTS, },

	.capture = {

		.stream_name = "Capture",

		.channels_min = 2,

		.channels_max = 2,

		.rates = SNDRV_PCM_RATE_48000,

		.formats = SNDRV_PCM_FMTBIT_S16_LE, },

		.formats = SND_SOC_STD_AC97_FMTS, },

};

EXPORT_SYMBOL_GPL(ad1980_dai);

sound/soc/codecs/wm9705.c

+2 −2
Original line number Diff line number Diff line
@@ -282,14 +282,14 @@ struct snd_soc_dai wm9705_dai[] = { 
			.channels_min = 1,

			.channels_max = 2,

			.rates = WM9705_AC97_RATES,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = SND_SOC_STD_AC97_FMTS,

		},

		.capture = {

			.stream_name = "HiFi Capture",

			.channels_min = 1,

			.channels_max = 2,

			.rates = WM9705_AC97_RATES,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = SND_SOC_STD_AC97_FMTS,

		},

		.ops = &wm9705_dai_ops,

	},

sound/soc/codecs/wm9712.c

+3 −3
Original line number Diff line number Diff line
@@ -534,13 +534,13 @@ struct snd_soc_dai wm9712_dai[] = { 
		.channels_min = 1,

		.channels_max = 2,

		.rates = WM9712_AC97_RATES,

		.formats = SNDRV_PCM_FMTBIT_S16_LE,},

		.formats = SND_SOC_STD_AC97_FMTS,},

	.capture = {

		.stream_name = "HiFi Capture",

		.channels_min = 1,

		.channels_max = 2,

		.rates = WM9712_AC97_RATES,

		.formats = SNDRV_PCM_FMTBIT_S16_LE,},

		.formats = SND_SOC_STD_AC97_FMTS,},

	.ops = &wm9712_dai_ops_hifi,

},

{
@@ -550,7 +550,7 @@ struct snd_soc_dai wm9712_dai[] = { 
		.channels_min = 1,

		.channels_max = 1,

		.rates = WM9712_AC97_RATES,

		.formats = SNDRV_PCM_FMTBIT_S16_LE,},

		.formats = SND_SOC_STD_AC97_FMTS,},

	.ops = &wm9712_dai_ops_aux,

}

};