History

Merge tag 'sound-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai: "It was a relatively calm development cycle, and no scaring changes are seen in both core and driver sides. Here are some highlights: ASoC: - A new API for hooking up jacks more generically and easily - Card longname is set based on DMI for a unique UCM profile - Lots of Intel driver fixes: Atom, Broxton, Skylake and newer chips - New drivers for Cirrus CS35L35, DIO DIO2125, Everest ES7132, HiSilicon hi6210, Maxim MAX98927, MT2701 systems with WM8960, Nuvoton NAU8824, Odroid systems, ST STM32 SAI controllers and x86 systems with DA7213 HD-audio: - Many new quirks to support headset for various devices (mostly ASUS ones) as usual - Support for dual codecs on some Gigabyte mobos and Lenovo laptop - Improvement on PCM position reporting for Skylake and newer FireWire: - New drivers for MOTU and RME Fireface series - Updates for Digidesign Digi00x and TASCAM series - Support for tracepoints Others: - USB-audio: improved support for quirk_alias option - Cleanups, constification allover the places" * tag 'sound-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (299 commits) ASoC: codec: wm8960: Relax bit clock computation when using PLL ASoC: codec: wm9860: avoid maybe-uninitialized warning ASoC: nau8824: leave Class D gain at chip default ASoC: nau8824: rename controls to match DAPM controls ASoC: Intel: Skylake: Return negative error code ASoC: Intel: Skylake: Fix unused variable warning ASoC: Intel: Skylake: fix uninitialized pointer use ASoC: sti: Fix error handling if of_clk_get() fails ASoC: cs4271: configure reset GPIO as output ASoC: dwc: Disallow building designware_pcm as a module ALSA: ali5451: fix spelling mistake in "ali_capture_preapre" ASoC: stm32: add SAI driver ASoC: stm32: add bindings for SAI ASoC: Intel: Skylake: Add loadable module support on KBL platform ASoC: Intel: Skylake: Modify load_lib_ipc arguments for a nowait version ASoC: Intel: Skylake: Register dsp_fw_ops for kabylake ASoC: Intel: Skylake: Modify arguments to reuse module transfer function ASoC: Intel: Skylake: Commonize library load ASoC: Intel: Skylake: Move sst common initialization to a helper function ASoC: nau8824: new driver ...

Linus Torvalds committed 9 years ago

Commit 221656e2 parents 2f34c12 a5c3b32306 files · +19287 −2691Browse files

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

Unified · Split

2 files
  1. include/uapi/sound/asound.h +3 −1
  2. include/uapi/sound/firewire.h +9 −1
include/uapi/sound/asound.h+3−1
@@ -107,9 +107,11 @@ enum { · 106 unmodified lines
107 SNDRV_HWDEP_IFACE_FW_DIGI00X, /* Digidesign Digi 002/003 family */107 SNDRV_HWDEP_IFACE_FW_DIGI00X, /* Digidesign Digi 002/003 family */
108 SNDRV_HWDEP_IFACE_FW_TASCAM, /* TASCAM FireWire series */108 SNDRV_HWDEP_IFACE_FW_TASCAM, /* TASCAM FireWire series */
109 SNDRV_HWDEP_IFACE_LINE6, /* Line6 USB processors */109 SNDRV_HWDEP_IFACE_LINE6, /* Line6 USB processors */
110 SNDRV_HWDEP_IFACE_FW_MOTU, /* MOTU FireWire series */
111 SNDRV_HWDEP_IFACE_FW_FIREFACE, /* RME Fireface series */
110 112
111 /* Don't forget to change the following: */113 /* Don't forget to change the following: */
112 SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_LINE6114 SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_FW_FIREFACE
113};115};
114 116
115struct snd_hwdep_info {117struct snd_hwdep_info {
include/uapi/sound/firewire.h+9−1
@@ -10,6 +10,7 @@ · 9 unmodified lines
10#define SNDRV_FIREWIRE_EVENT_DICE_NOTIFICATION 0xd1ce004e10#define SNDRV_FIREWIRE_EVENT_DICE_NOTIFICATION 0xd1ce004e
11#define SNDRV_FIREWIRE_EVENT_EFW_RESPONSE 0x4e61747511#define SNDRV_FIREWIRE_EVENT_EFW_RESPONSE 0x4e617475
12#define SNDRV_FIREWIRE_EVENT_DIGI00X_MESSAGE 0x746e736c12#define SNDRV_FIREWIRE_EVENT_DIGI00X_MESSAGE 0x746e736c
13#define SNDRV_FIREWIRE_EVENT_MOTU_NOTIFICATION 0x64776479
13 14
14struct snd_firewire_event_common {15struct snd_firewire_event_common {
15 unsigned int type; /* SNDRV_FIREWIRE_EVENT_xxx */16 unsigned int type; /* SNDRV_FIREWIRE_EVENT_xxx */
@@ -46,12 +47,18 @@ struct snd_firewire_event_digi00x_message { · 30 unmodified lines
46 __u32 message; /* Digi00x-specific message */47 __u32 message; /* Digi00x-specific message */
47};48};
48 49
50struct snd_firewire_event_motu_notification {
51 unsigned int type;
52 __u32 message; /* MOTU-specific bits. */
53};
54
49union snd_firewire_event {55union snd_firewire_event {
50 struct snd_firewire_event_common common;56 struct snd_firewire_event_common common;
51 struct snd_firewire_event_lock_status lock_status;57 struct snd_firewire_event_lock_status lock_status;
52 struct snd_firewire_event_dice_notification dice_notification;58 struct snd_firewire_event_dice_notification dice_notification;
53 struct snd_firewire_event_efw_response efw_response;59 struct snd_firewire_event_efw_response efw_response;
54 struct snd_firewire_event_digi00x_message digi00x_message;60 struct snd_firewire_event_digi00x_message digi00x_message;
61 struct snd_firewire_event_motu_notification motu_notification;
55};62};
56 63
57 64
@@ -65,7 +72,8 @@ union snd_firewire_event { · 7 unmodified lines
65#define SNDRV_FIREWIRE_TYPE_OXFW 472#define SNDRV_FIREWIRE_TYPE_OXFW 4
66#define SNDRV_FIREWIRE_TYPE_DIGI00X 573#define SNDRV_FIREWIRE_TYPE_DIGI00X 5
67#define SNDRV_FIREWIRE_TYPE_TASCAM 674#define SNDRV_FIREWIRE_TYPE_TASCAM 6
68/* RME, MOTU, ... */75#define SNDRV_FIREWIRE_TYPE_MOTU 7
76#define SNDRV_FIREWIRE_TYPE_FIREFACE 8
69 77
70struct snd_firewire_get_info {78struct snd_firewire_get_info {
71 unsigned int type; /* SNDRV_FIREWIRE_TYPE_xxx */79 unsigned int type; /* SNDRV_FIREWIRE_TYPE_xxx */

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