alistair23-linux/arch/arm/mach-at91
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
..
include/mach Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-12-12 18:07:07 -08:00
at91_aic.h arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
at91_rstc.h arm: at91: move reset controller header to arm/arm/mach-at91 2012-11-06 20:30:48 +08:00
at91_shdwc.h arm: at91: move at91_shdwc.h to arch/arm/mach-at91 2012-11-06 20:29:52 +08:00
at91_tc.h arn: at91: move at91_tc.h to arch/arm/mach-at91 2012-11-06 20:29:44 +08:00
at91rm9200.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91rm9200_devices.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91rm9200_time.c ARM: AT91: Add DT support to AT91RM9200 System Timer 2012-11-19 07:51:08 +08:00
at91sam9_alt_reset.S arm: at91: move reset controller header to arm/arm/mach-at91 2012-11-06 20:30:48 +08:00
at91sam9g45.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91sam9g45_devices.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91sam9g45_reset.S arm: at91: move reset controller header to arm/arm/mach-at91 2012-11-06 20:30:48 +08:00
at91sam9n12.c ARM: arm-soc: Header cleanups 2012-12-12 11:45:16 -08:00
at91sam9rl.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91sam9rl_devices.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91sam9x5.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91sam926x_time.c arm: at91: move pit define to the driver 2012-11-06 20:30:09 +08:00
at91sam9260.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91sam9260_devices.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91sam9261.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91sam9261_devices.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91sam9263.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91sam9263_devices.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
at91x40.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
at91x40_time.c arn: at91: move at91_tc.h to arch/arm/mach-at91 2012-11-06 20:29:44 +08:00
board-1arm.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-afeb-9260v1.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-cam60.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-carmeva.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-cpu9krea.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-cpuat91.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-csb337.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-12-12 18:07:07 -08:00
board-csb637.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-dt.c ARM: arm-soc: Header cleanups 2012-12-12 11:45:16 -08:00
board-eb01.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-eb9200.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-ecbat91.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-eco920.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-flexibity.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-foxg20.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-gsia18s.c arm: at91: move board header to arch/arm/mach-at91 2012-11-06 20:29:48 +08:00
board-kafa.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-kb9202.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-neocore926.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-pcontrol-g20.c arm: at91: move board header to arch/arm/mach-at91 2012-11-06 20:29:48 +08:00
board-picotux200.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-qil-a9260.c arm: at91: move at91_shdwc.h to arch/arm/mach-at91 2012-11-06 20:29:52 +08:00
board-rm9200-dt.c ARM: AT91: Add AT91RM9200EK board device tree 2012-11-19 07:51:10 +08:00
board-rm9200dk.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-rm9200ek.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-rsi-ews.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-sam9-l9260.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-sam9g20ek.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
board-sam9m10g45ek.c arm: at91: move at91_shdwc.h to arch/arm/mach-at91 2012-11-06 20:29:52 +08:00
board-sam9rlek.c arm: at91: move at91_shdwc.h to arch/arm/mach-at91 2012-11-06 20:29:52 +08:00
board-sam9260ek.c arm: at91: move at91_shdwc.h to arch/arm/mach-at91 2012-11-06 20:29:52 +08:00
board-sam9261ek.c arm: at91: move at91_shdwc.h to arch/arm/mach-at91 2012-11-06 20:29:52 +08:00
board-sam9263ek.c arm: at91: move at91_shdwc.h to arch/arm/mach-at91 2012-11-06 20:29:52 +08:00
board-snapper9260.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-stamp9g20.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board-usb-a926x.c arm: at91: move at91_shdwc.h to arch/arm/mach-at91 2012-11-06 20:29:52 +08:00
board-yl-9200.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
board.h ARM: arm-soc: Header cleanups 2012-12-12 11:45:16 -08:00
clock.c sections: fix section conflicts in arch/arm/ 2012-10-06 03:04:38 +09:00
clock.h at91: switch to CLKDEV_LOOKUP 2011-05-25 23:04:34 +08:00
cpuidle.c ARM: at91: pm select memory controler at runtime 2012-04-17 14:46:43 +02:00
generic.h Merge branch 'delivery/pinctrl-at91-3.8' of http://github.com/at91linux/linux-at91 into at91 2012-11-21 10:48:33 +01:00
gpio.c ARM: at91: add pinctrl support 2012-10-13 09:21:43 +08:00
gsia18s.h arm: at91: move board header to arch/arm/mach-at91 2012-11-06 20:29:48 +08:00
irq.c arm: at91 move at91_aic.h to arch/arm/mach-at91 2012-11-06 20:29:41 +08:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-12-12 18:07:07 -08:00
leds.c arm: at91 move board.h to arch/arm/mach-at91 2012-11-06 20:29:37 +08:00
Makefile ARM: AT91: Add AT91RM9200 DT board 2012-11-19 07:51:09 +08:00
Makefile.boot ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
pm.c arm: at91: move reset controller header to arm/arm/mach-at91 2012-11-06 20:30:48 +08:00
pm.h ARN: at91: introduce SOC_AT91xxx define to allow to compile SoC core support 2012-04-17 14:47:21 +02:00
pm_slowclock.S ARN: at91: introduce SOC_AT91xxx define to allow to compile SoC core support 2012-04-17 14:47:21 +02:00
sam9_smc.c ARM: at91: add accessor to manage SMC 2012-02-13 18:31:36 +01:00
sam9_smc.h ARM: at91: add accessor to manage SMC 2012-02-13 18:31:36 +01:00
setup.c ARM: arm-soc: Header cleanups 2012-12-12 11:45:16 -08:00
soc.h arm: at91: use macro to declare soc boot data 2012-10-13 09:09:28 +08:00
stamp9g20.h arm: at91: move board header to arch/arm/mach-at91 2012-11-06 20:29:48 +08:00