2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 03:33:59 +08:00
linux-next/include/linux/mfd
Linus Torvalds a429638cac Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
  ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
  ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
  ALSA: usb-audio: add Yamaha MOX6/MOX8 support
  ALSA: virtuoso: add S/PDIF input support for all Xonars
  ALSA: ice1724 - Support for ooAoo SQ210a
  ALSA: ice1724 - Allow card info based on model only
  ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
  ALSA: hdspm - Provide unique driver id based on card serial
  ASoC: Dynamically allocate the rtd device for a non-empty release()
  ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
  ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
  ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
  ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
  ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
  ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
  ALSA: hda/cirrus - support for iMac12,2 model
  ASoC: cx20442: add bias control over a platform provided regulator
  ALSA: usb-audio - Avoid flood of frame-active debug messages
  ALSA: snd-usb-us122l: Delete calls to preempt_disable
  mfd: Put WM8994 into cache only mode when suspending
  ...

Fix up trivial conflicts in:
 - arch/arm/mach-s3c64xx/mach-crag6410.c:
	renamed speyside_wm8962 to tobermory, added littlemill right
	next to it
 - drivers/base/regmap/{regcache.c,regmap.c}:
	duplicate diff that had already come in with other changes in
	the regmap tree
2012-01-12 08:00:30 -08:00
..
ab5500 mfd: ab5500 chip register access 2011-10-24 14:09:16 +02:00
ab8500
da9052 mfd: Declare da9052_regmap_config for the bus drivers 2011-12-15 14:52:37 +08:00
pcf50633
pm8xxx
wm831x Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6 2011-11-03 09:40:51 -07:00
wm8350
wm8994 Merge branch 'mfd/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into for-3.3 2011-12-13 00:19:20 +08:00
88pm860x.h
aat2870.h
ab8500.h
abx500.h mfd: Fix missing abx500 header file updates 2011-11-02 17:24:06 +01:00
adp5520.h
asic3.h
core.h
da903x.h
davinci_voicecodec.h
db5500-prcmu.h mfd: Move to the new db500 PRCMU API 2011-10-24 14:09:18 +02:00
db8500-prcmu.h mfd: Move to the new db500 PRCMU API 2011-10-24 14:09:18 +02:00
dbx500-prcmu.h mfd: Move to the new db500 PRCMU API 2011-10-24 14:09:18 +02:00
ds1wm.h
ezx-pcap.h
htc-egpio.h
htc-pasic3.h
intel_msic.h mfd: Add Intel MSIC driver 2011-10-24 14:09:15 +02:00
janz.h
max8925.h max8925_power: Enable power change notifications 2011-11-25 23:30:58 +04:00
max8997-private.h
max8997.h
max8998-private.h
max8998.h
mc13xxx.h regulator: mc13892: add device tree probe support 2011-12-22 11:10:45 +00:00
mc13783.h
mc13892.h
mcp.h
rdc321x.h
stmpe.h
t7l66xb.h
tc3589x.h
tc6387xb.h
tc6393xb.h
ti_ssp.h
tmio.h
tps6105x.h
tps6507x.h
tps6586x.h
tps65910.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-next 2011-11-23 18:48:57 +00:00
tps65912.h
twl4030-audio.h
twl6040.h
ucb1x00.h
wl1273-core.h
wm8400-audio.h
wm8400-private.h
wm8400.h