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

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
  ...

diff --combined MAINTAINERS
index b1bf92d9c44016a37a57fae2319b502f8c2db266,8779dae65f63c263dfa1bb2042228dedbff8f14a..abf98f09ff59876feedbeca7f5f66d7fd315719c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -355,7 -355,7 +355,7 @@@ F: Documentation/hwmon/adm102
  F:    drivers/hwmon/adm1025.c
  
  ADM1029 HARDWARE MONITOR DRIVER
 -M:    Corentin Labbe <c[email protected]>
 +M:    Corentin Labbe <c[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/hwmon/adm1029.c
@@@ -537,7 -537,7 +537,7 @@@ L: [email protected]
  F:    arch/alpha/
  
  ALTERA TRIPLE SPEED ETHERNET DRIVER
 -M:    Vince Bridgers <[email protected]
 +M:    Vince Bridgers <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1617,6 -1617,12 +1617,6 @@@ S:     Supporte
  F:    drivers/misc/atmel_tclib.c
  F:    drivers/clocksource/tcb_clksrc.c
  
 -ATMEL TSADCC DRIVER
 -M:    Josh Wu <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -F:    drivers/input/touchscreen/atmel_tsadcc.c
 -
  ATMEL USBA UDC DRIVER
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2188,7 -2194,6 +2188,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/char/*
  F:    drivers/misc/*
 +F:    include/linux/miscdevice.h
  
  CHECKPATCH
  M:    Andy Whitcroft <[email protected]>
@@@ -2405,6 -2410,7 +2405,6 @@@ F:      drivers/net/ethernet/ti/cpmac.
  CPU FREQUENCY DRIVERS
  M:    Rafael J. Wysocki <[email protected]>
  M:    Viresh Kumar <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
@@@ -2415,6 -2421,7 +2415,6 @@@ F:      include/linux/cpufreq.
  CPU FREQUENCY DRIVERS - ARM BIG LITTLE
  M:    Viresh Kumar <[email protected]>
  M:    Sudeep Holla <[email protected]>
 -L:    [email protected]
  L:    [email protected]
  W:    http://www.arm.com/products/processors/technologies/biglittleprocessing.php
  S:    Maintained
@@@ -2777,14 -2784,12 +2777,14 @@@ F:   sound/soc/codecs/da[79]*.[ch
  
  DIGI NEO AND CLASSIC PCI PRODUCTS
  M:    Lidza Louina <[email protected]>
 +M:    Mark Hounschell <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/staging/dgnc/
  
  DIGI EPCA PCI PRODUCTS
  M:    Lidza Louina <[email protected]>
 +M:    Mark Hounschell <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/staging/dgap/
@@@ -4199,11 -4204,9 +4199,11 @@@ S:    Maintaine
  F:    fs/hpfs/
  
  HSI SUBSYSTEM
 -M:    Sebastian Reichel <[email protected]>
 +M:    Sebastian Reichel <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-hsi
 +F:    Documentation/hsi.txt
  F:    drivers/hsi/
  F:    include/linux/hsi/
  F:    include/uapi/linux/hsi/
@@@ -6415,7 -6418,6 +6415,7 @@@ F:      drivers/usb/*/*omap
  F:    arch/arm/*omap*/usb*
  
  OMAP GPIO DRIVER
 +M:    Javier Martinez Canillas <[email protected]>
  M:    Santosh Shilimkar <[email protected]>
  M:    Kevin Hilman <[email protected]>
  L:    [email protected]
@@@ -6512,10 -6514,10 +6512,10 @@@ T:   git git://openrisc.net/~jonas/linu
  F:    arch/openrisc/
  
  OPENVSWITCH
 -M:    Jesse Gross <jesse@nicira.com>
 +M:    Pravin Shelar <pshelar@nicira.com>
  L:    [email protected]
  W:    http://openvswitch.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch.git
  S:    Maintained
  F:    net/openvswitch/
  
@@@ -6705,7 -6707,6 +6705,7 @@@ F:      Documentation/PCI
  F:    drivers/pci/
  F:    include/linux/pci*
  F:    arch/x86/pci/
 +F:    arch/x86/kernel/quirks.c
  
  PCI DRIVER FOR IMX6
  M:    Richard Zhu <[email protected]>
@@@ -6753,14 -6754,6 +6753,14 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/pci/host/*designware*
  
 +PCI DRIVER FOR GENERIC OF HOSTS
 +M:    Will Deacon <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
 +F:    drivers/pci/host/pci-host-generic.c
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    [email protected]
@@@ -6945,6 -6938,7 +6945,6 @@@ F:      drivers/power
  
  PNP SUPPORT
  M:    Rafael J. Wysocki <[email protected]>
 -M:    Bjorn Helgaas <[email protected]>
  S:    Maintained
  F:    drivers/pnp/
  
@@@ -7411,14 -7405,6 +7411,14 @@@ F:    drivers/rpmsg
  F:    Documentation/rpmsg.txt
  F:    include/linux/rpmsg.h
  
 +RESET CONTROLLER FRAMEWORK
 +M:    Philipp Zabel <[email protected]>
 +S:    Maintained
 +F:    drivers/reset/
 +F:    Documentation/devicetree/bindings/reset/
 +F:    include/linux/reset.h
 +F:    include/linux/reset-controller.h
 +
  RFKILL
  M:    Johannes Berg <[email protected]>
  L:    [email protected]
@@@ -8270,6 -8256,7 +8270,7 @@@ L:      [email protected] (moderat
  W:    http://www.alsa-project.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  T:    git git://git.alsa-project.org/alsa-kernel.git
+ Q:    http://patchwork.kernel.org/project/alsa-devel/list/
  S:    Maintained
  F:    Documentation/sound/
  F:    include/sound/
@@@ -8490,7 -8477,7 +8491,7 @@@ S:      Maintaine
  F:    drivers/staging/olpc_dcon/
  
  STAGING - OZMO DEVICES USB OVER WIFI DRIVER
 -M:    Rupesh Gujare <rupesh.gujare@atmel.com>
 +M:    Shigekatsu Tateno <shigekatsu.tateno@atmel.com>
  S:    Maintained
  F:    drivers/staging/ozwpan/
  
@@@ -8505,13 -8492,6 +8506,13 @@@ M:    Florian Schilhabel <florian.c.schilh
  S:    Odd Fixes
  F:    drivers/staging/rtl8712/
  
 +STAGING - REALTEK RTL8723U WIRELESS DRIVER
 +M:    Larry Finger <[email protected]>
 +M:    Jes Sorensen <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/staging/rtl8723au/
 +
  STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
  M:    Teddy Wang <[email protected]>
  S:    Odd Fixes

diff --combined drivers/firewire/core.h
index f477308b6e9ce23645784b3edc1bbd92b29b251d,870044e82316dadde3ff2edc4db7bf25318718db..e1480ff683d281f95320918712e566f6cec2e6b7
--- 1/drivers/firewire/core.h
--- 2/drivers/firewire/core.h
+++ b/drivers/firewire/core.h
@@@ -118,7 -118,6 +118,6 @@@ int fw_card_add(struct fw_card *card
                u32 max_receive, u32 link_speed, u64 guid);
  void fw_core_remove_card(struct fw_card *card);
  int fw_compute_block_crc(__be32 *block);
- void fw_schedule_bus_reset(struct fw_card *card, bool delayed, bool short_reset);
  void fw_schedule_bm_work(struct fw_card *card, unsigned long delay);
  
  /* -cdev */
@@@ -237,8 -236,8 +236,8 @@@ static inline bool is_next_generation(i
  
  #define LOCAL_BUS 0xffc0
  
 -/* arbitrarily chosen maximum range for physical DMA: 128 TB */
 -#define FW_MAX_PHYSICAL_RANGE         (128ULL << 40)
 +/* OHCI-1394's default upper bound for physical DMA: 4 GB */
 +#define FW_MAX_PHYSICAL_RANGE         (1ULL << 32)
  
  void fw_core_handle_request(struct fw_card *card, struct fw_packet *request);
  void fw_core_handle_response(struct fw_card *card, struct fw_packet *packet);