Commit 8788f839 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown

ASoc: Intel: Atom: add deep buffer definitions for atom platforms

Add definitions for MERR_DPCM_DEEP_BUFFER AND PIPE_MEDIA3_IN
Add relevant cpu-dai and dai link names
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 595788e4
...@@ -55,6 +55,7 @@ enum sst_audio_device_id_mrfld { ...@@ -55,6 +55,7 @@ enum sst_audio_device_id_mrfld {
PIPE_MEDIA0_IN = 0x8F, PIPE_MEDIA0_IN = 0x8F,
PIPE_MEDIA1_IN = 0x90, PIPE_MEDIA1_IN = 0x90,
PIPE_MEDIA2_IN = 0x91, PIPE_MEDIA2_IN = 0x91,
PIPE_MEDIA3_IN = 0x9C,
PIPE_RSVD = 0xFF, PIPE_RSVD = 0xFF,
}; };
......
...@@ -1109,6 +1109,7 @@ static const struct snd_soc_dapm_route intercon[] = { ...@@ -1109,6 +1109,7 @@ static const struct snd_soc_dapm_route intercon[] = {
{"media0_in", NULL, "Compress Playback"}, {"media0_in", NULL, "Compress Playback"},
{"media1_in", NULL, "Headset Playback"}, {"media1_in", NULL, "Headset Playback"},
{"media2_in", NULL, "pcm0_out"}, {"media2_in", NULL, "pcm0_out"},
{"media3_in", NULL, "Deepbuffer Playback"},
{"media0_out mix 0", "media0_in Switch", "media0_in"}, {"media0_out mix 0", "media0_in Switch", "media0_in"},
{"media0_out mix 0", "media1_in Switch", "media1_in"}, {"media0_out mix 0", "media1_in Switch", "media1_in"},
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
enum { enum {
MERR_DPCM_AUDIO = 0, MERR_DPCM_AUDIO = 0,
MERR_DPCM_DEEP_BUFFER,
MERR_DPCM_COMPR, MERR_DPCM_COMPR,
}; };
......
...@@ -98,6 +98,7 @@ static struct sst_dev_stream_map dpcm_strm_map[] = { ...@@ -98,6 +98,7 @@ static struct sst_dev_stream_map dpcm_strm_map[] = {
{MERR_DPCM_AUDIO, 0, SNDRV_PCM_STREAM_PLAYBACK, PIPE_MEDIA1_IN, SST_TASK_ID_MEDIA, 0}, {MERR_DPCM_AUDIO, 0, SNDRV_PCM_STREAM_PLAYBACK, PIPE_MEDIA1_IN, SST_TASK_ID_MEDIA, 0},
{MERR_DPCM_COMPR, 0, SNDRV_PCM_STREAM_PLAYBACK, PIPE_MEDIA0_IN, SST_TASK_ID_MEDIA, 0}, {MERR_DPCM_COMPR, 0, SNDRV_PCM_STREAM_PLAYBACK, PIPE_MEDIA0_IN, SST_TASK_ID_MEDIA, 0},
{MERR_DPCM_AUDIO, 0, SNDRV_PCM_STREAM_CAPTURE, PIPE_PCM1_OUT, SST_TASK_ID_MEDIA, 0}, {MERR_DPCM_AUDIO, 0, SNDRV_PCM_STREAM_CAPTURE, PIPE_PCM1_OUT, SST_TASK_ID_MEDIA, 0},
{MERR_DPCM_DEEP_BUFFER, 0, SNDRV_PCM_STREAM_PLAYBACK, PIPE_MEDIA3_IN, SST_TASK_ID_MEDIA, 0},
}; };
static int sst_media_digital_mute(struct snd_soc_dai *dai, int mute, int stream) static int sst_media_digital_mute(struct snd_soc_dai *dai, int mute, int stream)
...@@ -510,6 +511,17 @@ static struct snd_soc_dai_driver sst_platform_dai[] = { ...@@ -510,6 +511,17 @@ static struct snd_soc_dai_driver sst_platform_dai[] = {
.formats = SNDRV_PCM_FMTBIT_S16_LE, .formats = SNDRV_PCM_FMTBIT_S16_LE,
}, },
}, },
{
.name = "deepbuffer-cpu-dai",
.ops = &sst_media_dai_ops,
.playback = {
.stream_name = "Deepbuffer Playback",
.channels_min = SST_STEREO,
.channels_max = SST_STEREO,
.rates = SNDRV_PCM_RATE_44100|SNDRV_PCM_RATE_48000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
},
},
{ {
.name = "compress-cpu-dai", .name = "compress-cpu-dai",
.compress_new = snd_soc_new_compress, .compress_new = snd_soc_new_compress,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment