linux_dsm_epyc7002/arch/arm/mach-s3c64xx
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 soc updates, take 2 2012-07-30 09:45:53 -07:00
clock.c ARM: S3C64XX: Statically define parent clock of "camera" clock 2012-11-12 13:19:23 +09:00
common.c ARM: samsung: remove obsoleted init_consistent_dma_size() 2012-11-13 10:13:12 +01:00
common.h ARM: s3c64xx: use machine specific hook for late init 2012-05-08 20:36:24 +08:00
cpuidle.c ARM: S3C64XX: use timekeeping wrapper on cpuidle 2012-05-18 07:19:49 +09:00
dev-audio.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
dev-uart.c ARM: S3C64XX: Use common macro to define resources on dev-uart.c 2012-05-12 16:12:26 +09:00
dma.c arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
irq-pm.c ARM: S3C64XX: use static declaration when it is not used in other files 2012-01-21 12:02:31 +09:00
Kconfig ARM: S3C64XX: Add missing device selects for Cragganmore 2012-11-20 20:13:58 +09:00
mach-anw6410.c fbdev updates for 3.7 2012-10-12 10:21:02 +09:00
mach-crag6410-module.c ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore 2012-11-06 14:29:01 +09:00
mach-crag6410.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
mach-hmt.c fbdev updates for 3.7 2012-10-12 10:21:02 +09:00
mach-mini6410.c fbdev updates for 3.7 2012-10-12 10:21:02 +09:00
mach-ncp.c fbdev updates for 3.7 2012-10-12 10:21:02 +09:00
mach-real6410.c fbdev updates for 3.7 2012-10-12 10:21:02 +09:00
mach-smartq5.c include/video: move fimd register headers from platform to include/video 2012-08-08 09:44:49 +09:00
mach-smartq7.c include/video: move fimd register headers from platform to include/video 2012-08-08 09:44:49 +09:00
mach-smartq.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-smartq.h ARM: S3C6410: Add basic support for SmartQ machines 2010-05-20 19:42:15 +09:00
mach-smdk6400.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-smdk6410.c ASoC: Samsung: Do not register samsung audio dma device as pdev 2012-12-07 19:36:07 +09:00
Makefile ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pm.c ARM: s3c64xx: use machine specific hook for late init 2012-05-08 20:36:24 +08:00
s3c6400.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
s3c6410.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
setup-fb-24bpp.c ARM: S3C64XX: Remove extern from definition of framebuffer setup call 2011-12-02 14:17:36 +09:00
setup-i2c0.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c1.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-ide.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-keypad.c ARM: S3C64XX: Fix keypad setup to configure correct number of rows 2011-03-04 15:46:26 +09:00
setup-sdhci-gpio.c ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:51:37 +09:00
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: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00