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
112112 #define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0)
113113 #endif
114114
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
115+/* Address of data segment in memory after it is loaded. */
133116 #ifndef __KERNEL__
134117 #include <unistd.h>
135118 #endif
@@ -142,7 +125,6 @@ enum machine_type { · 6 unmodified lines
142125 #endif
143126 #endif
144127 #endif
145−#endif
146128
147129 #define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE)
148130
@@ -260,13 +242,7 @@ struct relocation_info · 111 unmodified lines
260242 unsigned int r_extern:1;
261243 /* Four bits that aren't used, but when writing an object file
262244 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
268245 unsigned int r_pad:4;
269−#endif
270246 };
271247 #endif /* no N_RELOCATION_INFO_DECLARED. */
272248
include/uapi/linux/ethtool.h+4−2
@@ -1486,8 +1486,10 @@ enum ethtool_link_mode_bit_indices { · 1485 unmodified lines
14861486 * it was forced up into this mode or autonegotiated.
14871487 */
14881488
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 */
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() and
1491+ * drivers/net/bonding/bond_3ad.c:__get_link_speed() when adding new values.
1492+ */
14911493 #define SPEED_10 10
14921494 #define SPEED_100 100
14931495 #define SPEED_1000 1000
include/uapi/linux/keyctl.h+2−2
@@ -70,8 +70,8 @@ struct keyctl_dh_params { · 69 unmodified lines
7070 };
7171
7272 struct keyctl_kdf_params {
73− char *hashname;
74− char *otherinfo;
73+ char __user *hashname;
74+ char __user *otherinfo;
7575 __u32 otherinfolen;
7676 __u32 __spare[8];
7777 };
include/uapi/linux/openvswitch.h+1−0
@@ -343,6 +343,7 @@ enum ovs_key_attr { · 342 unmodified lines
343343 #define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1)
344344
345345 enum ovs_tunnel_key_attr {
346+ /* OVS_TUNNEL_KEY_ATTR_NONE, standard nl API requires this attribute! */
346347 OVS_TUNNEL_KEY_ATTR_ID, /* be64 Tunnel ID */
347348 OVS_TUNNEL_KEY_ATTR_IPV4_SRC, /* be32 src IP address. */
348349 OVS_TUNNEL_KEY_ATTR_IPV4_DST, /* be32 dst IP address. */
include/uapi/sound/asoc.h+9−1
@@ -73,7 +73,15 @@ · 72 unmodified lines
7373 #define SND_SOC_TPLG_DAPM_DAI_IN 13
7474 #define SND_SOC_TPLG_DAPM_DAI_OUT 14
7575 #define SND_SOC_TPLG_DAPM_DAI_LINK 15
76−#define SND_SOC_TPLG_DAPM_LAST SND_SOC_TPLG_DAPM_DAI_LINK
76+#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
7785
7886 /* Header magic number and string sizes */
7987 #define SND_SOC_TPLG_MAGIC 0x41536F43 /* ASoC */
include/uapi/sound/snd_sst_tokens.h+6−2
@@ -161,6 +161,8 @@ · 160 unmodified lines
161161 *
162162 * %SKL_TKL_U32_D0I3_CAPS: Specifies the D0i3 capability for module
163163 *
164+ * %SKL_TKN_U32_DMA_BUF_SIZE: DMA buffer size in millisec
165+ *
164166 * module_id and loadable flags dont have tokens as these values will be
165167 * read from the DSP FW manifest
166168 */
@@ -213,8 +215,10 @@ enum SKL_TKNS { · 46 unmodified lines
213215 SKL_TKN_U32_LIB_COUNT,
214216 SKL_TKN_STR_LIB_NAME,
215217 SKL_TKN_U32_PMODE,
216− SKL_TKL_U32_D0I3_CAPS,
217− SKL_TKN_MAX = SKL_TKL_U32_D0I3_CAPS,
218+ SKL_TKL_U32_D0I3_CAPS, /* Typo added at v4.10 */
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,
218222 };
219223
220224 #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