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

Pull sound updates from Takashi Iwai:
 "At this time, majority of changes come from ASoC world while we got a
  few new drivers in other places for FireWire and USB.  There have been
  lots of ASoC core cleanups / refactoring, but very little visible to
  external users.

  ASoC:
   - Support for specifying aux CODECs in DT
   - Removal of the deprecated mux and enum macros
   - More moves towards full componentisation
   - Removal of some unused I/O code
   - Lots of cleanups, fixes and enhancements to the davinci, Freescale,
     Haswell and Realtek drivers
   - Several drivers exposed directly in Kconfig for use with
     simple-card
   - GPIO descriptor support for jacks
   - More updates and fixes to the Freescale SSI, Intel and rsnd drivers
   - New drivers for Cirrus CS42L56, Realtek RT5639, RT5642 and RT5651
     and ST STA350, Analog Devices ADAU1361, ADAU1381, ADAU1761 and
     ADAU1781, and Realtek RT5677

  HD-audio:
   - Clean up Dell headset quirks
   - Noise fixes for Dell and Sony laptops
   - Thinkpad T440 dock fix
   - Realtek codec updates (ALC293,ALC233,ALC3235)
   - Tegra HD-audio HDMI support

  FireWire-audio:
   - FireWire audio stack enhancement (AMDTP, MIDI), support for
     incoming isochronous stream and duplex streams with timestamp
     synchronization
   - BeBoB-based devices support
   - Fireworks-based device support

  USB-audio:
   - Behringer BCD2000 USB device support

  Misc:
   - Clean up of a few old drivers, atmel, fm801, etc"

* tag 'sound-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (480 commits)
  ASoC: Fix wrong argument for card remove callbacks
  ASoC: free jack GPIOs before the sound card is freed
  ALSA: firewire-lib: Remove a comment about restriction of asynchronous operation
  ASoC: cache: Fix error code when not using ASoC level cache
  ALSA: hda/realtek - Fix COEF widget NID for ALC260 replacer fixup
  ALSA: hda/realtek - Correction of fixup codes for PB V7900 laptop
  ALSA: firewire-lib: Use IEC 61883-6 compliant labels for Raw Audio data
  ASoC: add RT5677 CODEC driver
  ASoC: intel: The Baytrail/MAX98090 driver depends on I2C
  ASoC: rt5640: Add the function "get_clk_info" to RL6231 shared support
  ASoC: rt5640: Add the function of the PLL clock calculation to RL6231 shared support
  ASoC: rt5640: Add RL6231 class device shared support for RT5640, RT5645 and RT5651
  ASoC: cache: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
  ASoC: Add helper functions to cast from DAPM context to CODEC/platform
  ALSA: bebob: sizeof() vs ARRAY_SIZE() typo
  ASoC: wm9713: correct mono out PGA sources
  ALSA: synth: emux: soundfont.c: Cleaning up memory leak
  ASoC: fsl: Remove dependencies of boards for SND_SOC_EUKREA_TLV320
  ASoC: fsl-ssi: Use regmap
  ASoC: fsl-ssi: reorder and document fsl_ssi_private
  ...

1 files changed, 57 insertions, 6 deletions

diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig
index b3e274fe4a77..775ef2efc296 100644
--- a/sound/firewire/Kconfig
+++ b/sound/firewire/Kconfig
@@ -9,12 +9,12 @@ if SND_FIREWIRE && FIREWIRE
 
 config SND_FIREWIRE_LIB
         tristate
-        depends on SND_PCM
+        select SND_PCM
+        select SND_RAWMIDI
 
 config SND_DICE
         tristate "DICE-based DACs (EXPERIMENTAL)"
         select SND_HWDEP
-        select SND_PCM
         select SND_FIREWIRE_LIB
         help
           Say Y here to include support for many DACs based on the DICE
@@ -28,7 +28,6 @@ config SND_DICE
 
 config SND_FIREWIRE_SPEAKERS
         tristate "FireWire speakers"
-        select SND_PCM
         select SND_FIREWIRE_LIB
         help
           Say Y here to include support for the Griffin FireWave Surround
@@ -39,7 +38,6 @@ config SND_FIREWIRE_SPEAKERS
 
 config SND_ISIGHT
         tristate "Apple iSight microphone"
-        select SND_PCM
         select SND_FIREWIRE_LIB
         help
           Say Y here to include support for the front and rear microphones
@@ -50,8 +48,6 @@ config SND_ISIGHT
 
 config SND_SCS1X
         tristate "Stanton Control System 1 MIDI"
-        select SND_PCM
-        select SND_RAWMIDI
         select SND_FIREWIRE_LIB
         help
           Say Y here to include support for the MIDI ports of the Stanton
@@ -61,4 +57,59 @@ config SND_SCS1X
           To compile this driver as a module, choose M here: the module
           will be called snd-scs1x.
 
+config SND_FIREWORKS
+        tristate "Echo Fireworks board module support"
+        select SND_FIREWIRE_LIB
+        select SND_HWDEP
+        help
+          Say Y here to include support for FireWire devices based
+          on Echo Digital Audio Fireworks board:
+           * Mackie Onyx 400F/1200F
+           * Echo AudioFire12/8(until 2009 July)
+           * Echo AudioFire2/4/Pre8/8(since 2009 July)
+           * Echo Fireworks 8/HDMI
+           * Gibson Robot Interface Pack/GoldTop
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-fireworks.
+
+config SND_BEBOB
+        tristate "BridgeCo DM1000/DM1100/DM1500 with BeBoB firmware"
+        select SND_FIREWIRE_LIB
+        select SND_HWDEP
+        help
+         Say Y here to include support for FireWire devices based
+         on BridgeCo DM1000/DM1100/DM1500 with BeBoB firmware:
+          * Edirol FA-66/FA-101
+          * PreSonus FIREBOX/FIREPOD/FP10/Inspire1394
+          * BridgeCo RDAudio1/Audio5
+          * Mackie Onyx 1220/1620/1640 (Firewire I/O Card)
+          * Mackie d.2 (Firewire Option)
+          * Stanton FinalScratch 2 (ScratchAmp)
+          * Tascam IF-FW/DM
+          * Behringer XENIX UFX 1204/1604
+          * Behringer Digital Mixer X32 series (X-UF Card)
+          * Apogee Rosetta 200/400 (X-FireWire card)
+          * Apogee DA/AD/DD-16X (X-FireWire card)
+          * Apogee Ensemble
+          * ESI Quotafire610
+          * AcousticReality eARMasterOne
+          * CME MatrixKFW
+          * Phonic Helix Board 12 MkII/18 MkII/24 MkII
+          * Phonic Helix Board 12 Universal/18 Universal/24 Universal
+          * Lynx Aurora 8/16 (LT-FW)
+          * ICON FireXon
+          * PrismSound Orpheus/ADA-8XR
+          * TerraTec PHASE 24 FW/PHASE X24 FW/PHASE 88 Rack FW
+          * Terratec EWS MIC2/EWS MIC4
+          * Terratec Aureon 7.1 Firewire
+          * Yamaha GO44/GO46
+          * Focusrite Saffire/Saffire LE/SaffirePro10 IO/SaffirePro26 IO
+          * M-Audio Firewire410/AudioPhile/Solo
+          * M-Audio Ozonic/NRV10/ProfireLightBridge
+          * M-Audio Firewire 1814/ProjectMix IO
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-bebob.
+
 endif # SND_FIREWIRE