Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Pierre-Louis Bossart and committed by
Mark Brown
8788f839 595788e4

+15
+1
arch/x86/include/asm/platform_sst_audio.h
··· 55 55 PIPE_MEDIA0_IN = 0x8F, 56 56 PIPE_MEDIA1_IN = 0x90, 57 57 PIPE_MEDIA2_IN = 0x91, 58 + PIPE_MEDIA3_IN = 0x9C, 58 59 PIPE_RSVD = 0xFF, 59 60 }; 60 61
+1
sound/soc/intel/atom/sst-atom-controls.c
··· 1109 1109 {"media0_in", NULL, "Compress Playback"}, 1110 1110 {"media1_in", NULL, "Headset Playback"}, 1111 1111 {"media2_in", NULL, "pcm0_out"}, 1112 + {"media3_in", NULL, "Deepbuffer Playback"}, 1112 1113 1113 1114 {"media0_out mix 0", "media0_in Switch", "media0_in"}, 1114 1115 {"media0_out mix 0", "media1_in Switch", "media1_in"},
+1
sound/soc/intel/atom/sst-atom-controls.h
··· 28 28 29 29 enum { 30 30 MERR_DPCM_AUDIO = 0, 31 + MERR_DPCM_DEEP_BUFFER, 31 32 MERR_DPCM_COMPR, 32 33 }; 33 34
+12
sound/soc/intel/atom/sst-mfld-platform-pcm.c
··· 98 98 {MERR_DPCM_AUDIO, 0, SNDRV_PCM_STREAM_PLAYBACK, PIPE_MEDIA1_IN, SST_TASK_ID_MEDIA, 0}, 99 99 {MERR_DPCM_COMPR, 0, SNDRV_PCM_STREAM_PLAYBACK, PIPE_MEDIA0_IN, SST_TASK_ID_MEDIA, 0}, 100 100 {MERR_DPCM_AUDIO, 0, SNDRV_PCM_STREAM_CAPTURE, PIPE_PCM1_OUT, SST_TASK_ID_MEDIA, 0}, 101 + {MERR_DPCM_DEEP_BUFFER, 0, SNDRV_PCM_STREAM_PLAYBACK, PIPE_MEDIA3_IN, SST_TASK_ID_MEDIA, 0}, 101 102 }; 102 103 103 104 static int sst_media_digital_mute(struct snd_soc_dai *dai, int mute, int stream) ··· 507 506 .stream_name = "Headset Capture", 508 507 .channels_min = 1, 509 508 .channels_max = 2, 509 + .rates = SNDRV_PCM_RATE_44100|SNDRV_PCM_RATE_48000, 510 + .formats = SNDRV_PCM_FMTBIT_S16_LE, 511 + }, 512 + }, 513 + { 514 + .name = "deepbuffer-cpu-dai", 515 + .ops = &sst_media_dai_ops, 516 + .playback = { 517 + .stream_name = "Deepbuffer Playback", 518 + .channels_min = SST_STEREO, 519 + .channels_max = SST_STEREO, 510 520 .rates = SNDRV_PCM_RATE_44100|SNDRV_PCM_RATE_48000, 511 521 .formats = SNDRV_PCM_FMTBIT_S16_LE, 512 522 },