linux/arch/arm/plat-samsung
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/plat Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
adc.c ARM: SAMSUNG: use devm_ functions for ADC driver 2012-11-20 20:50:54 +09:00
clock-clksrc.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
clock.c ARM: soc: soc-specific updates 2012-10-01 18:24:44 -07:00
cpu.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
dev-backlight.c ARM: SAMSUNG: Add __init attribute to samsung_bl_set() 2012-03-09 08:03:13 -08:00
dev-uart.c ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices 2011-03-04 15:46:26 +09:00
devs.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
dma-ops.c ARM: SAMSUNG: dma-ops: Fix dmaengine_prep_dma_cyclic() parameter list 2012-09-24 18:35:47 +02:00
dma.c ARM: SAMSUNG: DMA Cleanup as per sparse 2011-07-16 15:50:19 +09:00
init.c ARM: SAMSUNG: Add support for handling of cpu revision 2011-08-24 19:25:19 +09:00
irq-vic-timer.c ARM: EXYNOS: add interrupt definitions for EXYNOS5250 2012-03-14 02:35:04 -07:00
Kconfig Merge branch 'next/devel-samsung-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc 2012-11-30 09:32:24 -08:00
Makefile ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers 2012-11-28 08:03:27 +09:00
platformdata.c ARM: SAMSUNG: remove all uses of clk_type member in sdhci platform data 2012-04-21 08:24:56 -07:00
pm-check.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
pm-gpio.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
pm.c ARM: Samsung: Make uart_save static in pm.c file 2012-08-08 09:04:51 +09:00
pwm-clock.c ARM: SAMSUNG: Consolidate plat/pwm-clock.h 2011-10-04 19:48:41 +09:00
s3c-dma-ops.c ARM: SAMSUNG: Add config() function in DMA common operations 2012-06-20 08:07:35 +09:00
s5p-clock.c ARM: SAMSUNG: Update default rate for xusbxti clock 2012-07-13 15:34:30 +09:00
s5p-dev-mfc.c ARM: EXYNOS: Add MFC device tree support 2012-10-19 10:26:31 +09:00
s5p-dev-uart.c ARM: SAMSUNG: move platform device for s5p uart into plat-samsung 2012-05-13 07:01:51 +09:00
s5p-irq-eint.c ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung 2012-05-13 07:01:27 +09:00
s5p-irq-gpioint.c ARM: SAMSUNG: Insert bitmap_gpio_int member in samsung_gpio_chip 2012-10-23 22:39:33 +09:00
s5p-irq-pm.c ARM: SAMSUNG: move pm part for common s5p into plat-samsung 2012-05-13 07:01:34 +09:00
s5p-irq.c ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung 2012-05-13 07:01:27 +09:00
s5p-pm.c ARM: SAMSUNG: move pm part for common s5p into plat-samsung 2012-05-13 07:01:34 +09:00
s5p-sleep.S ARM: SAMSUNG: move pm part for common s5p into plat-samsung 2012-05-13 07:01:34 +09:00
s5p-time.c ARM: SAMSUNG: move hr timer for common s5p into plat-samsung 2012-05-13 07:01:43 +09:00
setup-camif.c ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers 2012-11-28 08:03:27 +09:00
setup-mipiphy.c [media] ARM: samsung: Change __s5p_mipi_phy_control() function signature 2012-10-05 22:28:43 -03:00
time.c ARM: plat-samsung: remove including old leds event API header file 2012-08-01 11:22:12 +08:00
wakeup-mask.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00