History

Merge tag 'asoc-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v4.5 This is quite a busy release on the driver front with a lot of new drivers being added but comparatively quiet on the core side with only one big change going in and that a fairly straightforward refactoring. - Conversion of the array of DAI links to a list by Mengdong Lin, supporting dynamically adding and removing DAI links. - Some more fixes for the topology code, though it is still not final and ready for enabling in production. We really need to get to the point where that can be done. - A pile of changes for Intel SkyLake drivers which hopefully deliver some useful initial functionality for systems with this chipset, though there is more work still to come. - New drivers for a number of Imagination Technologies IPs. - Lots of new features and cleanups for the Renesas drivers. - ANC support for WM5110. - New driver for Atmel class D speaker drivers. - New drivers for Cirrus CS47L24 and WM1831. - New driver for Dialog DA7128. - New drivers for Realtek RT5659 and RT56156. - New driver for Rockchip RK3036. - New driver for TI PC3168A

Takashi Iwai committed 10 years ago

Commit f80e39e2 parents 59c8231 822ad70196 files · +30487 −4162Browse files

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

Unified · Split

2 files
  1. include/uapi/sound/asoc.h +1 −1
  2. include/uapi/sound/compress_params.h +3 −2
include/uapi/sound/asoc.h+1−1
@@ -243,7 +243,7 @@ struct snd_soc_tplg_manifest { · 242 unmodified lines
243243 __le32 control_elems; /* number of control elements */
244244 __le32 widget_elems; /* number of widget elements */
245245 __le32 graph_elems; /* number of graph elements */
246− __le32 dai_elems; /* number of DAI elements */
246+ __le32 pcm_elems; /* number of PCM elements */
247247 __le32 dai_link_elems; /* number of DAI link elements */
248248 struct snd_soc_tplg_private priv;
249249 } __attribute__((packed));
include/uapi/sound/compress_params.h+3−2
@@ -73,7 +73,8 @@ · 72 unmodified lines
7373 #define SND_AUDIOCODEC_IEC61937 ((__u32) 0x0000000B)
7474 #define SND_AUDIOCODEC_G723_1 ((__u32) 0x0000000C)
7575 #define SND_AUDIOCODEC_G729 ((__u32) 0x0000000D)
76−#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_G729
76+#define SND_AUDIOCODEC_BESPOKE ((__u32) 0x0000000E)
77+#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_BESPOKE
7778
7879 /*
7980 * Profile and modes are listed with bit masks. This allows for a
@@ -312,7 +313,7 @@ struct snd_enc_flac { · 232 unmodified lines
312313
313314 struct snd_enc_generic {
314315 __u32 bw; /* encoder bandwidth */
315− __s32 reserved[15];
316+ __s32 reserved[15]; /* Can be used for SND_AUDIOCODEC_BESPOKE */
316317 } __attribute__((packed, aligned(4)));
317318
318319 union snd_codec_options {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t