History

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

ASoC: Updates for v3.12 - DAPM is now mandatory for CODEC drivers in order to avoid the repeated regressions in the special cases for non-DAPM CODECs and make it easier to integrate with other components on boards. All existing drivers have had some level of DAPM support added. - A lot of cleanups in DAPM plus support for maintaining controls in a specific state while a DAPM widget all contributed by Lars-Peter Clausen. - Core helpers for bitbanged AC'97 reset from Markus Pargmann. - New drivers and support for Analog Devices ADAU1702 and ADAU1401(a), Asahi Kasei Microdevices AK4554, Atmel AT91ASM9x5 and WM8904 based machines, Freescale S/PDIF and SSI AC'97, Renesas R-Car SoCs, Samsung Exynos5420 SoCs, Texas Instruments PCM1681 and PCM1792A and Wolfson Microelectronics WM8997. - Support for building drivers that can support it cross-platform for compile test.

Takashi Iwai committed 13 years ago

Commit 68538bf2 parents a8cc209 43bcb401779 files · +27760 −104803Browse files

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

Unified · Split

6 files
  1. include/uapi/asm-generic/fcntl.h +2 −2
  2. include/uapi/linux/firewire-cdev.h +2 −2
  3. include/uapi/linux/nfc.h +3 −3
  4. include/uapi/linux/pkt_sched.h +9 −1
  5. include/uapi/linux/snmp.h +1 −1
  6. include/uapi/linux/usb/ch11.h +11 −0
include/uapi/asm-generic/fcntl.h+2−2
@@ -89,8 +89,8 @@ · 88 unmodified lines
8989 #endif
9090
9191 /* a horrid kludge trying to make sure that this will fail on old kernels */
92−#define O_TMPFILE (__O_TMPFILE | O_DIRECTORY | O_RDWR)
93−#define O_TMPFILE_MASK (__O_TMPFILE | O_DIRECTORY | O_CREAT | O_ACCMODE)
92+#define O_TMPFILE (__O_TMPFILE | O_DIRECTORY)
93+#define O_TMPFILE_MASK (__O_TMPFILE | O_DIRECTORY | O_CREAT)
9494
9595 #ifndef O_NDELAY
9696 #define O_NDELAY O_NONBLOCK
include/uapi/linux/firewire-cdev.h+2−2
@@ -215,8 +215,8 @@ struct fw_cdev_event_request2 { · 214 unmodified lines
215215 * with the %FW_CDEV_ISO_INTERRUPT bit set, when explicitly requested with
216216 * %FW_CDEV_IOC_FLUSH_ISO, or when there have been so many completed packets
217217 * without the interrupt bit set that the kernel's internal buffer for @header
218− * is about to overflow. (In the last case, kernels with ABI version < 5 drop
219− * header data up to the next interrupt packet.)
218+ * is about to overflow. (In the last case, ABI versions < 5 drop header data
219+ * up to the next interrupt packet.)
220220 *
221221 * Isochronous transmit events (context type %FW_CDEV_ISO_CONTEXT_TRANSMIT):
222222 *
include/uapi/linux/nfc.h+3−3
@@ -69,8 +69,8 @@ · 68 unmodified lines
6969 * starting a poll from a device which has a secure element enabled means
7070 * we want to do SE based card emulation.
7171 * @NFC_CMD_DISABLE_SE: Disable the physical link to a specific secure element.
72− * @NFC_CMD_FW_UPLOAD: Request to Load/flash firmware, or event to inform that
73− * some firmware was loaded
72+ * @NFC_CMD_FW_DOWNLOAD: Request to Load/flash firmware, or event to inform
73+ * that some firmware was loaded
7474 */
7575 enum nfc_commands {
7676 NFC_CMD_UNSPEC,
@@ -94,7 +94,7 @@ enum nfc_commands { · 17 unmodified lines
9494 NFC_CMD_DISABLE_SE,
9595 NFC_CMD_LLC_SDREQ,
9696 NFC_EVENT_LLC_SDRES,
97− NFC_CMD_FW_UPLOAD,
97+ NFC_CMD_FW_DOWNLOAD,
9898 NFC_EVENT_SE_ADDED,
9999 NFC_EVENT_SE_REMOVED,
100100 /* private: internal use only */
include/uapi/linux/pkt_sched.h+9−1
@@ -73,9 +73,17 @@ struct tc_estimator { · 72 unmodified lines
7373 #define TC_H_ROOT (0xFFFFFFFFU)
7474 #define TC_H_INGRESS (0xFFFFFFF1U)
7575
76+/* Need to corrospond to iproute2 tc/tc_core.h "enum link_layer" */
77+enum tc_link_layer {
78+ TC_LINKLAYER_UNAWARE, /* Indicate unaware old iproute2 util */
79+ TC_LINKLAYER_ETHERNET,
80+ TC_LINKLAYER_ATM,
81+};
82+#define TC_LINKLAYER_MASK 0x0F /* limit use to lower 4 bits */
83+
7684 struct tc_ratespec {
7785 unsigned char cell_log;
78− unsigned char __reserved;
86+ __u8 linklayer; /* lower 4 bits */
7987 unsigned short overhead;
8088 short cell_align;
8189 unsigned short mpu;
include/uapi/linux/snmp.h+1−1
@@ -253,7 +253,7 @@ enum · 252 unmodified lines
253253 LINUX_MIB_TCPFASTOPENLISTENOVERFLOW, /* TCPFastOpenListenOverflow */
254254 LINUX_MIB_TCPFASTOPENCOOKIEREQD, /* TCPFastOpenCookieReqd */
255255 LINUX_MIB_TCPSPURIOUS_RTX_HOSTQUEUES, /* TCPSpuriousRtxHostQueues */
256− LINUX_MIB_LOWLATENCYRXPACKETS, /* LowLatencyRxPackets */
256+ LINUX_MIB_BUSYPOLLRXPACKETS, /* BusyPollRxPackets */
257257 __LINUX_MIB_MAX
258258 };
259259
include/uapi/linux/usb/ch11.h+11−0
@@ -11,6 +11,17 @@ · 10 unmodified lines
1111
1212 #include <linux/types.h> /* __u8 etc */
1313
14+/* This is arbitrary.
15+ * From USB 2.0 spec Table 11-13, offset 7, a hub can
16+ * have up to 255 ports. The most yet reported is 10.
17+ *
18+ * Current Wireless USB host hardware (Intel i1480 for example) allows
19+ * up to 22 devices to connect. Upcoming hardware might raise that
20+ * limit. Because the arrays need to add a bit for hub status data, we
21+ * use 31, so plus one evens out to four bytes.
22+ */
23+#define USB_MAXCHILDREN 31
24+
1425 /*
1526 * Hub request types
1627 */

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