History

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

ASoC: Updates for v4.13 The big news with this release is the of-graph card, this provides a replacement for simple-card that is much more flexibile and scalable, allowing many more systems to use a generic sound card than was possible before: - The of-graph card, finally merged after a long and dedicated effort by Morimoto-san. - New widget types intended mainly for use with DSPs. - New drivers for Allwinner V3s SoCs, Ensonic ES8316, several classes of x86 machine, Rockchip PDM controllers, STM32 I2S and S/PDIF controllers and ZTE AUD96P22 CODECs.

Takashi Iwai committed 9 years ago

Commit 818a23e2 parents a178232 b821d291501 files · +24726 −9790Browse files

Showing the changes to include/uapi (6 of 1501 files). Show all

Unified · Split

6 files
  1. include/uapi/linux/a.out.h +1 −25
  2. include/uapi/linux/ethtool.h +4 −2
  3. include/uapi/linux/keyctl.h +2 −2
  4. include/uapi/linux/openvswitch.h +1 −0
  5. include/uapi/sound/asoc.h +9 −1
  6. include/uapi/sound/snd_sst_tokens.h +6 −2
include/uapi/linux/a.out.h+1−25
@@ -112,24 +112,7 @@ enum machine_type { · 111 unmodified lines
112#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0)112#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0)
113#endif113#endif
114 114
115/* Address of data segment in memory after it is loaded.115/* Address of data segment in memory after it is loaded. */
116 Note that it is up to you to define SEGMENT_SIZE
117 on machines not listed here. */
118#if defined(vax) || defined(hp300) || defined(pyr)
119#define SEGMENT_SIZE page_size
120#endif
121#ifdef sony
122#define SEGMENT_SIZE 0x2000
123#endif /* Sony. */
124#ifdef is68k
125#define SEGMENT_SIZE 0x20000
126#endif
127#if defined(m68k) && defined(PORTAR)
128#define PAGE_SIZE 0x400
129#define SEGMENT_SIZE PAGE_SIZE
130#endif
131
132#ifdef linux
133#ifndef __KERNEL__116#ifndef __KERNEL__
134#include <unistd.h>117#include <unistd.h>
135#endif118#endif
@@ -142,7 +125,6 @@ enum machine_type { · 6 unmodified lines
142#endif125#endif
143#endif126#endif
144#endif127#endif
145#endif
146 128
147#define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE)129#define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE)
148 130
@@ -260,13 +242,7 @@ struct relocation_info · 111 unmodified lines
260 unsigned int r_extern:1;242 unsigned int r_extern:1;
261 /* Four bits that aren't used, but when writing an object file243 /* Four bits that aren't used, but when writing an object file
262 it is desirable to clear them. */244 it is desirable to clear them. */
263#ifdef NS32K
264 unsigned r_bsr:1;
265 unsigned r_disp:1;
266 unsigned r_pad:2;
267#else
268 unsigned int r_pad:4;245 unsigned int r_pad:4;
269#endif
270};246};
271#endif /* no N_RELOCATION_INFO_DECLARED. */247#endif /* no N_RELOCATION_INFO_DECLARED. */
272 248
include/uapi/linux/ethtool.h+4−2
@@ -1486,8 +1486,10 @@ enum ethtool_link_mode_bit_indices { · 1485 unmodified lines
1486 * it was forced up into this mode or autonegotiated.1486 * it was forced up into this mode or autonegotiated.
1487 */1487 */
1488 1488
1489/* The forced speed, in units of 1Mb. All values 0 to INT_MAX are legal. */1489/* The forced speed, in units of 1Mb. All values 0 to INT_MAX are legal.
1490/* Update drivers/net/phy/phy.c:phy_speed_to_str() when adding new values */1490 * Update drivers/net/phy/phy.c:phy_speed_to_str() and
1491 * drivers/net/bonding/bond_3ad.c:__get_link_speed() when adding new values.
1492 */
1491#define SPEED_10 101493#define SPEED_10 10
1492#define SPEED_100 1001494#define SPEED_100 100
1493#define SPEED_1000 10001495#define SPEED_1000 1000
include/uapi/linux/keyctl.h+2−2
@@ -70,8 +70,8 @@ struct keyctl_dh_params { · 69 unmodified lines
70};70};
71 71
72struct keyctl_kdf_params {72struct keyctl_kdf_params {
73 char *hashname;73 char __user *hashname;
74 char *otherinfo;74 char __user *otherinfo;
75 __u32 otherinfolen;75 __u32 otherinfolen;
76 __u32 __spare[8];76 __u32 __spare[8];
77};77};
include/uapi/linux/openvswitch.h+1−0
@@ -343,6 +343,7 @@ enum ovs_key_attr { · 342 unmodified lines
343#define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1)343#define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1)
344 344
345enum ovs_tunnel_key_attr {345enum ovs_tunnel_key_attr {
346 /* OVS_TUNNEL_KEY_ATTR_NONE, standard nl API requires this attribute! */
346 OVS_TUNNEL_KEY_ATTR_ID, /* be64 Tunnel ID */347 OVS_TUNNEL_KEY_ATTR_ID, /* be64 Tunnel ID */
347 OVS_TUNNEL_KEY_ATTR_IPV4_SRC, /* be32 src IP address. */348 OVS_TUNNEL_KEY_ATTR_IPV4_SRC, /* be32 src IP address. */
348 OVS_TUNNEL_KEY_ATTR_IPV4_DST, /* be32 dst IP address. */349 OVS_TUNNEL_KEY_ATTR_IPV4_DST, /* be32 dst IP address. */
include/uapi/sound/asoc.h+9−1
@@ -73,7 +73,15 @@ · 72 unmodified lines
73#define SND_SOC_TPLG_DAPM_DAI_IN 1373#define SND_SOC_TPLG_DAPM_DAI_IN 13
74#define SND_SOC_TPLG_DAPM_DAI_OUT 1474#define SND_SOC_TPLG_DAPM_DAI_OUT 14
75#define SND_SOC_TPLG_DAPM_DAI_LINK 1575#define SND_SOC_TPLG_DAPM_DAI_LINK 15
76#define SND_SOC_TPLG_DAPM_LAST SND_SOC_TPLG_DAPM_DAI_LINK76#define SND_SOC_TPLG_DAPM_BUFFER 16
77#define SND_SOC_TPLG_DAPM_SCHEDULER 17
78#define SND_SOC_TPLG_DAPM_EFFECT 18
79#define SND_SOC_TPLG_DAPM_SIGGEN 19
80#define SND_SOC_TPLG_DAPM_SRC 20
81#define SND_SOC_TPLG_DAPM_ASRC 21
82#define SND_SOC_TPLG_DAPM_ENCODER 22
83#define SND_SOC_TPLG_DAPM_DECODER 23
84#define SND_SOC_TPLG_DAPM_LAST SND_SOC_TPLG_DAPM_DECODER
77 85
78/* Header magic number and string sizes */86/* Header magic number and string sizes */
79#define SND_SOC_TPLG_MAGIC 0x41536F43 /* ASoC */87#define SND_SOC_TPLG_MAGIC 0x41536F43 /* ASoC */
include/uapi/sound/snd_sst_tokens.h+6−2
@@ -161,6 +161,8 @@ · 160 unmodified lines
161 *161 *
162 * %SKL_TKL_U32_D0I3_CAPS: Specifies the D0i3 capability for module162 * %SKL_TKL_U32_D0I3_CAPS: Specifies the D0i3 capability for module
163 *163 *
164 * %SKL_TKN_U32_DMA_BUF_SIZE: DMA buffer size in millisec
165 *
164 * module_id and loadable flags dont have tokens as these values will be166 * module_id and loadable flags dont have tokens as these values will be
165 * read from the DSP FW manifest167 * read from the DSP FW manifest
166 */168 */
@@ -213,8 +215,10 @@ enum SKL_TKNS { · 46 unmodified lines
213 SKL_TKN_U32_LIB_COUNT,215 SKL_TKN_U32_LIB_COUNT,
214 SKL_TKN_STR_LIB_NAME,216 SKL_TKN_STR_LIB_NAME,
215 SKL_TKN_U32_PMODE,217 SKL_TKN_U32_PMODE,
216 SKL_TKL_U32_D0I3_CAPS,218 SKL_TKL_U32_D0I3_CAPS, /* Typo added at v4.10 */
217 SKL_TKN_MAX = SKL_TKL_U32_D0I3_CAPS,219 SKL_TKN_U32_D0I3_CAPS = SKL_TKL_U32_D0I3_CAPS,
220 SKL_TKN_U32_DMA_BUF_SIZE,
221 SKL_TKN_MAX = SKL_TKN_U32_DMA_BUF_SIZE,
218};222};
219 223
220#endif224#endif

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