History

Merge tag 'asoc-v5.17' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v5.17 Not much going on framework release this time, but a big update for drivers especially the Intel and SOF ones. - Refinements and cleanups around the delay() APIs. - Wider use of dev_err_probe(). - Continuing cleanups and improvements to the SOF code. - Support for pin switches in simple-card derived cards. - Support for AMD Renoir ACP, Asahi Kasei Microdevices AKM4375, Intel systems using NAU8825 and MAX98390, Mediatek MT8915, nVidia Tegra20 S/PDIF, Qualcomm systems using ALC5682I-VS and Texas Instruments TLV320ADC3xxx.

Takashi Iwai committed 4 years ago

Commit dec36c02 parents f81483a 9f3d453335 files · +14713 −4936Browse files

Showing the changes to include/uapi (2 of 335 files). Show all

Unified · Split

2 files
  1. include/uapi/sound/asound.h +1 −1
  2. include/uapi/sound/sof/tokens.h +5 −0
include/uapi/sound/asound.h+1−1
@@ -305,7 +305,7 @@ typedef int __bitwise snd_pcm_subformat_t; · 304 unmodified lines
305#define SNDRV_PCM_INFO_HAS_LINK_ESTIMATED_ATIME 0x04000000 /* report estimated link audio time */305#define SNDRV_PCM_INFO_HAS_LINK_ESTIMATED_ATIME 0x04000000 /* report estimated link audio time */
306#define SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME 0x08000000 /* report synchronized audio/system time */306#define SNDRV_PCM_INFO_HAS_LINK_SYNCHRONIZED_ATIME 0x08000000 /* report synchronized audio/system time */
307#define SNDRV_PCM_INFO_EXPLICIT_SYNC 0x10000000 /* needs explicit sync of pointers and data */307#define SNDRV_PCM_INFO_EXPLICIT_SYNC 0x10000000 /* needs explicit sync of pointers and data */
308 308#define SNDRV_PCM_INFO_NO_REWINDS 0x20000000 /* hardware can only support monotonic changes of appl_ptr */
309#define SNDRV_PCM_INFO_DRAIN_TRIGGER 0x40000000 /* internal kernel flag - trigger in drain */309#define SNDRV_PCM_INFO_DRAIN_TRIGGER 0x40000000 /* internal kernel flag - trigger in drain */
310#define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000 /* internal kernel flag - FIFO size is in frames */310#define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000 /* internal kernel flag - FIFO size is in frames */
311 311
include/uapi/sound/sof/tokens.h+5−0
@@ -140,4 +140,9 @@ · 139 unmodified lines
140#define SOF_TKN_INTEL_HDA_RATE 1500140#define SOF_TKN_INTEL_HDA_RATE 1500
141#define SOF_TKN_INTEL_HDA_CH 1501141#define SOF_TKN_INTEL_HDA_CH 1501
142 142
143/* AFE */
144#define SOF_TKN_MEDIATEK_AFE_RATE 1600
145#define SOF_TKN_MEDIATEK_AFE_CH 1601
146#define SOF_TKN_MEDIATEK_AFE_FORMAT 1602
147
143#endif148#endif