linux-hardened/include/linux/mfd
Linus Torvalds 046e7d685b Sound updates for 3.8-rc1
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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQIcBAABAgAGBQJQyYh9AAoJEGwxgFQ9KSmk95UP+wcVXRynWulCVwEnVjjWv/UM
 2fIsD0RkWO4WoqEVCNCHzW27pvFC36uqLx5vtas4CoJ2CX8ufQsPqWTx6K3MY/DQ
 /VJT8CI2EKPQY1Q0PySVo2nBqwcUXWWoZE47t1ZowR6cxtmgrS8lLxYJvkbfEOHF
 PS8WItACqH5F5VPxGFkhPwR2OTLfaYt7ilKx82vgxSzdMAel8q/I9uS/MUv8KV+1
 1s5yBvlW5eyDXKpQbP/KiMJLJ/zk1MRAKK2HftAk8pNt+Xy160NvXhbILDWKC4uT
 QBRPqyIe8BmL3VlXpw3mn7nbeU7rSfc/Rbrnm2+Yb54/Wtj4PnV6Z6bg7HO610im
 e/tBNHoaL7qn1iNYSC3heW11rToksd03/LK0GREvkX3Bl21T+Naaun/DY/PGIfMQ
 nOXy7uVo6sVdZnN2MTWof9qeMYBSlrwQVsMde6kbYadNcXnuqUqCOx41kiAdE8t5
 jfZy5QR+uDjdJgDv8/CuiCYxSjjTUfO1tdSV/VjsTK17Gfw3DWTJpeznVnoIALbZ
 81HXYxb+uGZ8xDr0WXGkydlnPvB6bnWu2vvfrLBkioA/p60EDNCtgKo1y3NzQGh8
 P2qILNhXIRrS2EoAScQOb6F1RPsvbDN9PbihnkShX3r7DXyeynr9jgPy3L2vf0bR
 xyu0jtQiqYb34ss7qqdz
 =IIsz
 -----END PGP SIGNATURE-----

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
..
abx500 mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
arizona Input - arizona-haptics: Add driver haptics module on Arizona CODECs 2012-11-28 13:43:52 +00:00
da9052 MFD changes for 3.5 2012-05-29 11:53:11 -07:00
da9055 mfd: DA9055 core driver 2012-09-29 01:25:28 +02:00
pcf50633
pm8xxx mfd: remove use of __devexit 2012-11-28 12:22:27 -08:00
samsung mfd: Add s2mps11 irq driver 2012-07-16 14:31:59 +02:00
syscon ARM: imx6q: Add iomuxc gpr support into syscon 2012-09-17 15:24:31 +02:00
wm831x MFD changes for 3.5 2012-05-29 11:53:11 -07:00
wm8350 mfd: Remove custom wm8350 cache implementation 2012-07-09 00:16:10 +02:00
wm8994 mfd: wm8994: Store platform data in device 2012-11-23 21:10:13 +09:00
88pm80x.h mfd: remove use of __devinit 2012-11-28 12:20:19 -08:00
88pm860x.h 1. New drivers: 2012-10-07 17:29:24 +09:00
aat2870.h
ab3100.h mfd: ab3100: Split ab3100 headers out of abx500.h 2012-09-14 09:52:15 +02:00
abx500.h mfd: ab3100: Split ab3100 headers out of abx500.h 2012-09-14 09:52:15 +02:00
adp5520.h
asic3.h MFD changes for 3.5 2012-05-29 11:53:11 -07:00
core.h mfd: core: Push irqdomain mapping out into devices 2012-09-15 23:22:04 +02:00
da903x.h
davinci_voicecodec.h
db8500-prcmu.h mfd: dbx500: Export prmcu_request_ape_opp_100_voltage 2012-10-29 11:05:12 -07:00
dbx500-prcmu.h mfd: dbx500: Export prmcu_request_ape_opp_100_voltage 2012-10-29 11:05:12 -07:00
ds1wm.h
ezx-pcap.h ARM: pxa: remove irq_to_gpio from ezx-pcap driver 2012-08-09 15:16:41 +02:00
htc-egpio.h
htc-pasic3.h
intel_msic.h
janz.h
lm3533.h mfd: Add r_select to lm3533 platform data 2012-05-22 23:47:42 +02:00
lp8788-isink.h mfd: Add lp8788 mfd driver 2012-09-23 20:51:34 +02:00
lp8788.h mfd: Add lp8788 mfd driver 2012-09-23 20:51:34 +02:00
lpc_ich.h gpio: gpio-ich: Share ownership of GPIO groups 2012-09-14 09:52:13 +02:00
max8907.h mfd: max8907: Add power off control 2012-09-19 12:07:56 +02:00
max8925.h mfd: max8925: Remove array in regulator platform data 2012-09-19 12:39:13 +02:00
max8997-private.h mfd: Add irq domain support for max8997 interrupts 2012-07-09 00:16:13 +02:00
max8997.h mfd: Add irq domain support for max8997 interrupts 2012-07-09 00:16:13 +02:00
max8998-private.h
max8998.h mfd: printk/comment fixes 2012-09-01 10:01:31 -07:00
max77686-private.h mfd: Remove unused max77686 iolock mutex 2012-07-09 00:16:14 +02:00
max77686.h regulator: max77686: initialize of_node param for regulator register 2012-08-28 11:00:25 -07:00
max77693-private.h mfd: Remove unused max77693 iolock mutex 2012-07-09 00:16:07 +02:00
max77693.h extcon: MAX77693: Add platform data for MUIC device to initialize registers 2012-10-23 16:32:16 +09:00
mc13xxx.h
mc13783.h
mc13892.h
mcp.h
menelaus.h ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h 2012-10-15 13:53:41 -07:00
palmas.h mfd: palmas: Change regulator defns to better suite DT 2012-09-23 20:51:29 +02:00
rc5t583.h rtc: rc5t583: add ricoh rc5t583 RTC driver 2012-10-06 03:05:03 +09:00
rdc321x.h
rtsx_common.h drivers/mfd: Add realtek pcie card reader driver 2012-11-15 17:30:14 -08:00
rtsx_pci.h drivers/mfd: Add realtek pcie card reader driver 2012-11-15 17:30:14 -08:00
smsc.h mfd: smsc: Add support for smsc gpio io/keypad driver 2012-10-01 15:27:48 +02:00
sta2x11-mfd.h
stmpe.h
syscon.h mfd: Add syscon driver based on regmap 2012-09-17 15:24:14 +02:00
t7l66xb.h
tc3589x.h mfd: Provide the tc3589x with its own IRQ domain 2012-09-17 15:03:38 +02:00
tc6387xb.h
tc6393xb.h
ti_ssp.h
tmio.h mmc: tmio: support caps2 flags 2012-07-21 00:02:18 -04:00
tps6105x.h
tps6507x.h
tps6586x.h MFD bits for the 3.7 merge window. 2012-10-05 12:01:30 +09:00
tps65090.h
tps65217.h backlight: Add TPS65217 WLED driver 2012-09-25 10:42:02 +02:00
tps65910.h Merge branch 'akpm' (Andrew's patch-bomb) 2012-10-06 03:09:16 +09:00
tps65912.h
twl4030-audio.h
twl6040.h MFD bits for the 3.7 merge window. 2012-10-05 12:01:30 +09:00
ucb1x00.h
wl1273-core.h
wm8400-audio.h
wm8400-private.h mfd: Remove wm8400 custom cache implementation 2012-05-20 17:27:01 +02:00
wm8400.h