Linus Torvalds 046e7d685b
Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound ...
Pull sound updates from Takashi Iwai:
"This update contains a fairly wide range of changes all over in sound
subdirectory, mainly because of UAPI header moves by David and __dev*
annotation removals by Bill. Other highlights are:
- Introduced the support for wallclock timestamps in ALSA PCM core
- Add the poll loop implementation for HD-audio jack detection
- Yet more VGA-switcheroo fixes for HD-audio
- New VIA HD-audio codec support
- More fixes on resource management in USB audio and MIDI drivers
- More quirks for USB-audio ASUS Xonar U3, Reloop Play, Focusrite,
Roland VG-99, etc
- Add support for FastTrack C400 usb-audio
- Clean ups in many drivers regarding firmware loading
- Add PSC724 Ultiimate Edge support to ice1712
- A few hdspm driver updates
- New Stanton SCS.1d/1m FireWire driver
- Standardisation of the logging in ASoC codes
- DT and dmaengine support for ASoC Atmel
- Support for Wolfson ADSP cores
- New drivers for Freescale/iVeia P1022 and Maxim MAX98090
- Lots of other ASoC driver fixes and developments"
Fix up trivial conflicts. And go out on a limb and assume the dts file
'status' field of one of the conflicting things was supposed to be
"disabled", not "disable" like in pretty much all other cases.
* tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (341 commits)
ALSA: hda - Move runtime PM check to runtime_idle callback
ALSA: hda - Add stereo-dmic fixup for Acer Aspire One 522
ALSA: hda - Avoid doubly suspend after vga switcheroo
ALSA: usb-audio: Enable S/PDIF on the ASUS Xonar U3
ALSA: hda - Check validity of CORB/RIRB WP reads
ALSA: hda - use usleep_range in link reset and change timeout check
ALSA: HDA: VIA: Add support for codec VT1808.
ALSA: HDA: VIA Add support for codec VT1705CF.
ASoC: codecs: remove __dev* attributes
ASoC: utils: remove __dev* attributes
ASoC: ux500: remove __dev* attributes
ASoC: txx9: remove __dev* attributes
ASoC: tegra: remove __dev* attributes
ASoC: spear: remove __dev* attributes
ASoC: sh: remove __dev* attributes
ASoC: s6000: remove __dev* attributes
ASoC: OMAP: remove __dev* attributes
ASoC: nuc900: remove __dev* attributes
ASoC: mxs: remove __dev* attributes
ASoC: kirkwood: remove __dev* attributes
...
2012-12-13 11:51:23 -08:00
2012-07-09 20:45:31 +02:00
2012-12-12 18:07:07 -08:00
2012-12-12 18:07:07 -08:00
2012-12-12 18:07:07 -08:00
2012-11-06 15:45:53 +01:00
2012-07-02 01:27:44 -07:00
2012-11-20 01:10:28 +08:00
2012-07-10 15:47:49 +02:00
2012-09-21 18:05:29 +00:00
2012-09-22 14:51:40 +00:00
2012-09-22 14:50:24 +00:00
2012-09-22 14:51:40 +00:00
2012-09-22 14:51:40 +00:00
2012-09-22 14:51:40 +00:00
2012-08-02 10:05:32 -07:00
2012-11-19 07:51:10 +08:00
2012-11-19 07:51:10 +08:00
2012-10-13 09:21:44 +08:00
2012-10-13 09:21:44 +08:00
2012-09-12 14:49:16 +02:00
2012-11-20 01:10:27 +08:00
2012-12-13 11:51:23 -08:00
2012-04-20 23:17:05 +08:00
2012-10-13 09:21:44 +08:00
2012-10-13 09:21:44 +08:00
2012-10-13 09:21:44 +08:00
2012-10-13 09:21:44 +08:00
2012-12-13 11:51:23 -08:00
2012-11-20 01:10:27 +08:00
2012-11-20 01:10:27 +08:00
2012-11-20 01:10:27 +08:00
2012-12-13 11:51:23 -08:00
2012-04-04 18:35:52 +02:00
2012-11-20 01:10:27 +08:00
2012-11-19 06:54:25 +08:00
2012-10-13 09:21:44 +08:00
2012-10-13 09:21:44 +08:00
2012-10-13 09:21:44 +08:00
2012-12-13 11:51:23 -08:00
2012-12-13 11:51:23 -08:00
2012-11-20 01:10:27 +08:00
2012-10-25 20:42:51 -06:00
2012-10-25 20:42:51 -06:00
2012-11-19 22:39:07 -08:00
2012-11-19 22:39:07 -08:00
2012-11-01 13:02:25 +01:00
2012-11-21 13:32:21 +09:00
2012-10-29 15:43:43 +05:30
2012-10-29 15:43:13 +05:30
2012-10-29 15:42:21 +05:30
2012-12-13 10:39:26 -08:00
2012-09-21 17:07:24 +00:00
2012-11-24 02:57:27 +00:00
2012-09-21 17:07:24 +00:00
2012-11-24 02:57:22 +00:00
2012-09-06 11:40:48 +02:00
2012-10-31 13:46:17 -05:00
2012-10-31 13:46:17 -05:00
2012-09-07 19:18:40 +02:00
2012-05-18 00:14:03 +02:00
2012-05-18 00:14:03 +02:00
2012-04-27 23:23:22 +08:00
2012-11-16 15:48:48 +01:00
2012-12-13 10:39:26 -08:00
2012-11-22 00:39:01 +09:00
2012-11-19 10:03:07 +09:00
2012-11-22 00:38:56 +09:00
2012-11-22 00:39:01 +09:00
2012-10-17 18:13:40 +09:00
2012-11-20 20:17:20 +09:00
2012-11-22 00:39:00 +09:00
2012-11-07 08:52:25 +09:00
2012-11-07 09:12:10 +09:00
2012-11-07 08:52:25 +09:00
2012-11-26 00:06:23 -08:00
2012-11-21 13:32:21 +09:00
2012-11-26 00:06:23 -08:00
2012-11-22 13:42:49 +09:00
2012-11-22 13:50:14 +09:00
2012-07-09 20:22:00 +02:00
2012-10-31 13:46:17 -05:00
2012-11-01 12:59:32 +01:00
2012-11-27 10:58:27 +00:00
2012-11-20 16:10:43 +00:00
2012-10-16 10:07:04 -07:00
2012-11-16 14:18:52 +08:00
2012-09-19 11:25:42 +08:00
2012-11-16 14:18:53 +08:00
2012-12-13 10:39:26 -08:00
2012-08-23 10:01:30 +08:00
2012-11-20 21:46:14 +08:00
2012-08-23 10:01:11 +08:00
2012-11-25 23:26:53 -08:00
2012-11-12 12:11:27 +01:00
2012-11-12 12:11:23 +01:00
2012-11-16 16:21:48 +01:00
2012-11-16 09:12:00 +01:00
2012-10-01 14:23:11 -07:00
2012-11-16 14:18:53 +08:00
2012-10-19 16:45:20 +08:00
2012-11-12 10:07:43 +08:00
2012-08-23 10:01:11 +08:00
2012-11-22 09:03:40 +08:00
2012-11-05 10:53:34 +08:00
2012-10-15 10:51:48 +08:00
2012-09-05 11:53:11 +08:00
2012-11-20 22:09:05 +08:00
2012-08-23 10:01:11 +08:00
2012-12-13 10:39:26 -08:00
2012-07-10 19:23:03 +02:00
2012-07-10 19:23:03 +02:00
2012-11-16 16:34:18 +01:00
2012-12-13 10:39:26 -08:00
2012-09-11 16:26:51 +08:00
2012-09-11 16:26:52 +08:00
2012-11-16 14:18:52 +08:00
2012-09-11 16:26:52 +08:00
2012-12-13 10:39:26 -08:00
2012-09-17 23:20:23 +01:00
2012-11-16 22:25:50 +01:00
2012-11-16 22:26:07 +01:00
2012-11-24 02:58:43 +00:00
2012-11-24 02:58:52 +00:00
2012-11-24 02:58:56 +00:00
2012-07-27 16:49:53 +02:00
2012-07-27 16:49:53 +02:00
2012-11-24 02:57:56 +00:00
2012-11-24 02:58:05 +00:00
2012-11-24 02:58:11 +00:00
2012-11-24 02:58:18 +00:00
2012-11-24 02:58:25 +00:00
2012-11-24 02:57:47 +00:00
2012-11-24 02:58:36 +00:00
2012-11-21 20:58:35 +00:00
2012-11-24 02:58:48 +00:00
2012-07-27 16:50:57 +02:00
2012-07-27 16:50:57 +02:00
2012-11-24 02:58:30 +00:00
2012-11-24 02:58:52 +00:00
2012-11-21 20:58:35 +00:00
2012-11-21 20:58:35 +00:00
2012-11-21 20:58:43 +00:00
2012-11-21 20:58:35 +00:00
2012-11-21 20:58:49 +00:00
2012-11-21 20:59:30 +00:00
2012-11-24 02:59:12 +00:00
2012-11-21 20:59:22 +00:00
2012-11-24 02:57:43 +00:00
2012-11-24 02:57:43 +00:00
2012-07-27 16:50:57 +02:00
2012-11-24 02:57:35 +00:00
2012-04-20 23:17:33 +08:00
2012-11-14 15:41:18 +01:00
2012-12-13 10:39:26 -08:00
2012-06-05 16:42:38 +08:00
2012-08-16 16:17:10 +08:00
2012-09-13 11:14:54 -07:00
2012-09-13 11:16:47 -07:00
2012-10-29 16:56:32 +01:00
2012-10-29 16:56:24 +01:00
2012-10-29 16:56:24 +01:00
2012-09-07 19:22:44 +02:00
2012-09-10 15:44:45 +02:00
2012-09-10 12:07:22 +02:00
2012-10-29 16:56:33 +01:00
2012-11-07 11:50:28 +01:00
2012-11-07 11:50:28 +01:00
2012-11-07 11:50:28 +01:00
2012-11-07 11:50:29 +01:00
2012-11-07 11:50:29 +01:00
2012-10-29 16:56:35 +01:00
2012-11-01 17:03:31 +01:00
2012-11-05 18:38:27 +01:00
2012-11-05 18:38:03 +01:00
2012-09-10 10:34:51 -07:00
2012-09-07 19:22:49 +02:00
2012-10-29 16:56:33 +01:00
2012-10-29 16:56:33 +01:00
2012-11-21 21:00:51 +00:00
2012-11-21 21:00:45 +00:00
2012-09-25 10:11:41 +02:00
2012-11-20 01:10:28 +08:00
2012-09-05 14:48:10 +08:00
2012-09-05 14:48:10 +08:00
2012-08-16 16:15:25 +08:00
2012-08-16 16:15:25 +08:00
2012-08-16 16:15:25 +08:00
2012-05-05 16:39:29 +08:00
2012-10-02 11:43:17 +02:00
2012-10-05 12:01:30 +09:00
2012-05-14 23:23:42 +02:00
2012-07-06 21:03:35 +02:00
2012-11-05 18:38:27 +01:00
2012-05-16 22:16:30 +02:00
2012-10-30 15:25:53 +08:00
2012-04-11 12:19:31 +02:00
2012-12-13 10:39:26 -08:00
2012-07-19 10:39:00 +02:00
2012-07-19 10:39:00 +02:00
2012-06-20 14:39:36 -07:00
2012-07-18 10:04:45 +05:30
2012-10-07 17:41:44 -04:00
2012-06-20 14:39:36 -07:00
2012-06-20 14:39:36 -07:00
2012-11-11 19:08:52 +01:00
2012-11-11 19:08:52 +01:00
2012-11-11 19:08:52 +01:00
2012-05-12 21:50:04 +02:00
2012-07-18 10:05:05 +05:30
2012-11-11 19:08:52 +01:00
2012-11-11 19:08:52 +01:00
2012-11-11 19:08:52 +01:00
2012-11-11 19:08:52 +01:00
2012-11-01 13:02:26 +01:00
2012-11-20 15:36:34 +01:00
2012-11-26 19:02:40 +01:00
2012-11-20 15:36:00 +01:00
2012-11-20 15:36:00 +01:00
2012-11-21 09:25:25 +01:00
2012-11-16 09:14:26 -07:00
2012-09-20 09:34:00 -06:00
2012-11-05 11:36:04 -07:00
2012-11-16 09:17:08 -07:00
2012-12-13 10:39:26 -08:00
2012-11-16 09:17:08 -07:00
2012-11-16 09:17:09 -07:00
2012-11-16 09:14:40 -07:00
2012-11-15 15:07:30 -07:00
2012-11-16 10:56:38 -07:00
2012-11-16 12:22:16 -07:00
2012-11-15 15:07:28 -07:00
2012-11-15 15:07:28 -07:00
2012-11-15 15:07:29 -07:00
2012-12-13 10:57:16 -08:00
2012-04-20 23:17:00 +08:00
2012-04-20 23:17:00 +08:00
2012-04-20 23:17:00 +08:00
2012-04-20 23:17:30 +08:00
2012-08-30 13:59:17 -07:00
2012-08-30 13:57:53 -07:00
2012-10-29 16:56:29 +01:00
2012-10-29 16:56:29 +01:00
2012-11-20 16:10:46 +00:00
2012-04-20 23:17:11 +08:00
2012-04-20 23:17:11 +08:00
2012-04-20 23:17:15 +08:00
2012-04-20 23:17:27 +08:00
2012-04-23 15:46:15 +01:00
2012-04-23 15:46:15 +01:00
2012-11-05 17:09:52 +00:00
2012-11-05 17:09:52 +00:00
2012-11-05 17:09:52 +00:00
2012-11-05 17:09:52 +00:00
2012-11-05 17:09:52 +00:00
2012-11-05 17:09:52 +00:00
2012-09-21 19:23:54 +12:00
2012-09-21 19:23:54 +12:00
2012-09-21 19:23:54 +12:00
2012-10-15 21:12:52 -07:00
2012-09-21 19:23:54 +12:00
2012-09-21 19:23:54 +12:00
2012-09-24 16:40:52 +00:00
2012-11-14 16:10:42 +01:00
2012-11-14 16:10:42 +01:00
046e7d685b