linux/arch/arm/mach-exynos
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 ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
clock-exynos4.c ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
clock-exynos4.h ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file 2012-07-17 07:52:03 +09:00
clock-exynos5.c ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
clock-exynos4210.c ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file 2012-07-17 07:52:03 +09:00
clock-exynos4212.c ARM: EXYNOS: Add G2D related clock entries for SMDK4X12 2012-07-17 07:52:03 +09:00
common.c ARM: arm-soc: power management and clock changes 2012-12-13 10:58:20 -08:00
common.h ARM: SoC: convert Exynos4 to SMP operations 2012-09-14 11:14:50 +02:00
cpuidle.c ARM: EXYNOS: Remove scu_enable from cpuidle 2012-11-28 07:42:07 +09:00
dev-ahci.c ARM: EXYNOS: Use common macro to define resources on dev-ahci.c 2012-05-12 16:12:19 +09:00
dev-audio.c ARM: EXYNOS: reorder inclusions of <linux/platform_data/xxx.h> 2012-11-07 08:11:30 +09:00
dev-ohci.c ARM: EXYNOS: reorder inclusions of <linux/platform_data/xxx.h> 2012-11-07 08:11:30 +09:00
dev-sysmmu.c ARM: EXYNOS: Change System MMU platform device definitions 2012-04-04 09:23:02 -07:00
dev-uart.c ARM: EXYNOS: Remove unused static uart resource information 2012-10-29 19:48:54 +09:00
dma.c ARM: EXYNOS: PL330 MDMA1 fix for revision 0 of Exynos4210 SOC 2012-11-20 20:39:39 +09:00
headsmp.S ARM: exynos: remove incorrect BSYM usage 2012-01-16 08:36:04 -06:00
hotplug.c ARM: EXYNOS: fix the hotplug for Cortex-A15 2012-11-28 07:42:04 +09:00
Kconfig ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
mach-armlex4210.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
mach-exynos4-dt.c ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
mach-exynos5-dt.c ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
mach-nuri.c ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
mach-origen.c ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
mach-smdk4x12.c ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
mach-smdkv310.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
mach-universal_c210.c ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
Makefile ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
Makefile.boot ARM: dts: Add basic dts file for Samsung Trats board 2012-09-21 10:50:27 +09:00
mct.c ARM: EXYNOS: add support for EXYNOS5440 SoC 2012-11-22 13:09:18 +09:00
platsmp.c ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412 2012-11-28 08:04:29 +09:00
pm_domains.c ARM: EXYNOS: Bind devices to power domains using DT 2012-11-22 00:38:59 +09:00
pm.c ARM: EXYNOS: Add flush_cache_all in suspend finisher 2012-11-28 07:42:08 +09:00
pmu.c ARM: EXYNOS: Add missing static storage class specifier in pmu.c file 2012-07-13 06:46:08 +09:00
setup-fimc.c
setup-fimd0.c include/video: move fimd register headers from platform to include/video 2012-08-08 09:44:49 +09:00
setup-i2c0.c ARM: EXYNOS: add support for EXYNOS5440 SoC 2012-11-22 13:09:18 +09:00
setup-i2c1.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c2.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c3.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c4.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c5.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c6.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c7.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-keypad.c
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-usb-phy.c ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12 2012-07-13 06:45:55 +09:00