linux-hardened/arch/arm/mach-s3c24xx
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 branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
bast-ide.c ARM: S3C24XX: Use common macro to define resources on bast-ide.c 2012-05-12 16:12:20 +09:00
bast-irq.c
clock-s3c244x.c
clock-s3c2412.c
clock-s3c2416.c spi: s3c64xx: move controller information into driver data 2012-07-13 15:23:46 +09:00
clock-s3c2440.c ARM: S3C24XX: Add clkdev entry for camif-upll clock 2012-11-28 08:03:28 +09:00
clock-s3c2443.c ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443 2012-11-20 20:02:58 +09:00
common-s3c2443.c spi: s3c64xx: move controller information into driver data 2012-07-13 15:23:46 +09:00
common-smdk.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
common.c ARM: S3C24XX: Remove duplicate header file inclusion 2012-06-20 09:19:17 +09:00
common.h ARM: S3C24XX: fix missing common.h in mach-s3c24xx/ 2012-04-02 06:43:23 +09:00
dma-s3c2410.c
dma-s3c2412.c
dma-s3c2440.c
dma-s3c2443.c ARM: S3C24XX: claim spi channels for hsspi in dma-s3c2443 2012-04-24 18:06:53 -07:00
h1940-bluetooth.c ARM: S3C24XX: Use module_platform_driver macro in h1940-bluetooth.c 2012-09-07 06:33:24 +09:00
irq-pm.c ARM: S3C24XX: move common power-management code to mach-s3c24xx 2012-05-12 16:22:18 +09:00
irq-s3c244x.c
irq-s3c2412.c
irq-s3c2416.c ARM: s3c24xx: fix multiple section mismatch warnings 2012-10-07 10:33:06 +02:00
irq-s3c2440.c
irq-s3c2443.c ARM: s3c24xx: fix multiple section mismatch warnings 2012-10-07 10:33:06 +02:00
Kconfig ARM: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
mach-amlm5900.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-anubis.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-at2440evb.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-bast.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-gta02.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
mach-h1940.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
mach-jive.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-mini2440.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
mach-n30.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-nexcoder.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-osiris-dvs.c ARM: S3C24XX: Use module_platform_driver macro in mach-osiris-dvs.c 2012-09-07 06:33:28 +09:00
mach-osiris.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-otom.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-qt2410.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-rx1950.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
mach-rx3715.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-smdk2410.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-smdk2413.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-smdk2416.c fbdev updates for 3.7 2012-10-12 10:21:02 +09:00
mach-smdk2440.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-smdk2443.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-tct_hammer.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-vr1000.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-vstms.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
Makefile arm-soc: soc specific changes, part 2 2012-05-26 13:05:55 -07:00
Makefile.boot
pm-h1940.S
pm-s3c2410.c ARM: S3C24XX: Convert the PM code to gpiolib API 2012-07-13 18:05:00 +09:00
pm-s3c2412.c ARM: S3C24XX: Remove unused GPIO definitions for port J 2012-07-13 18:05:29 +09:00
pm-s3c2416.c
pm.c ARM: S3C24XX: move common power-management code to mach-s3c24xx 2012-05-12 16:22:18 +09:00
s3c244x.c ARM: S3C24XX: Remove unused GPIO definitions for port J 2012-07-13 18:05:29 +09:00
s3c2410.c
s3c2412.c ARM: S3C24XX: Remove unused GPIO definitions for port J 2012-07-13 18:05:29 +09:00
s3c2416.c ARM: SAMSUNG: Add naming of s3c64xx-spi devices 2012-10-17 16:47:32 +09:00
s3c2440.c
s3c2442.c
s3c2443.c ARM: SAMSUNG: Add naming of s3c64xx-spi devices 2012-10-17 16:47:32 +09:00
setup-i2c.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-sdhci-gpio.c
setup-spi.c ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions 2012-07-13 15:23:46 +09:00
setup-ts.c ARM: S3C24XX: Convert the touchscreen setup code to common GPIO API 2012-07-13 18:05:05 +09:00
simtec-audio.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
simtec-nor.c ARM: S3C24XX: Use common macro to define resources on simtec-nor.c 2012-05-12 16:12:25 +09:00
simtec-pm.c
simtec-usb.c Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
simtec.h
sleep-s3c2410.S
sleep-s3c2412.S
sleep.S ARM: S3C24XX: move common power-management code to mach-s3c24xx 2012-05-12 16:22:18 +09:00