linux/arch/arm/plat-samsung/include/plat
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
..
adc-core.h ARM: SAMSUNG: Allow overriding of adc device name for S3C24XX 2011-10-12 21:34:42 +09:00
adc.h Update broken web addresses in arch directory. 2010-10-18 11:03:21 +02:00
ata-core.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
backlight.h ARM: SAMSUNG: Fix Section mismatch in samsung_bl_set() 2011-08-19 20:57:20 +09:00
camport.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
clock-clksrc.h
clock.h ARM: S3C24XX: remove XXX_setup_clocks method from S3C2443 2012-03-07 02:00:04 -08:00
common-smdk.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
cpu-freq-core.h ARM: SAMSUNG: Fix build error when selecting CPU_FREQ_S3C24XX_DEBUGFS on S3C2440 2011-12-28 15:08:28 +09:00
cpu-freq.h
cpu.h ARM: EXYNOS: add support for EXYNOS5440 SoC 2012-11-22 13:09:18 +09:00
debug-macro.S ARM: S5P6442: Removing ARCH_S5P6442 2011-05-12 08:10:53 +09:00
devs.h Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
dma-core.h
dma-ops.h ARM: SAMSUNG: Add config() function in DMA common operations 2012-06-20 08:07:35 +09:00
dma-pl330.h ARM: EXYNOS: Support DMA for EXYNOS5250 SoC 2012-05-13 08:20:04 +09:00
dma-s3c24xx.h arm: convert sysdev_class to a regular subsystem 2011-12-21 16:01:38 -08:00
dma.h ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h 2012-01-12 02:00:16 +09:00
fb-core.h ARM: EXYNOS4: Add platform device and helper functions for FIMD 2011-07-21 17:28:51 +09:00
fb-s3c2410.h ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c 2011-10-06 11:14:30 +09:00
fb.h ARM: SAMSUNG: Remove description corresponding to a deleted element 2012-06-20 09:18:39 +09:00
fimc-core.h ARM: S5P: Add platform definitions for FIMC3 2011-03-12 08:58:01 +09:00
fiq.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
gpio-cfg-helpers.h ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
gpio-cfg.h treewide: Put a space between #include and FILE 2012-06-28 11:44:36 +02:00
gpio-core.h ARM: SAMSUNG: Insert bitmap_gpio_int member in samsung_gpio_chip 2012-10-23 22:39:33 +09:00
gpio-fns.h ARM: S3C24XX: Remove obsolete GPIO API declarations 2012-08-28 09:06:49 -07:00
hdmi.h ARM: SAMSUNG: Add API to set platform data for s5p-tv driver 2012-08-08 15:53:38 +09:00
iic-core.h ARM: S5PV210: add common I2C device helpers 2010-05-20 18:21:34 +09:00
irq-uart.h
irq-vic-timer.h ARM: SAMSUNG: Convert irq-vic-timer to generic irq chip 2011-05-09 10:12:39 +02:00
irq.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
irqs.h ARM: SAMSUNG: Move timer irq numbers to end of linux irq space 2011-12-23 10:04:39 +09:00
keypad-core.h ARM: S5PV210: Add keypad device helpers 2010-08-05 18:31:01 +09:00
keypad.h Input: samsung-keypad - enable compiling on other platforms 2011-11-15 09:46:14 -08:00
map-base.h ARM: SAMSUNG: Move the start address of Samsung SoCs' VA space 2010-10-25 16:11:38 +09:00
map-s3c.h ARM: SAMSUNG: Fix for S3C2412 EBI memory mapping 2012-06-21 03:53:46 +09:00
map-s5p.h ARM: SAMSUNG: Move map header file into plat-samsung 2011-09-16 20:20:33 +09:00
mfc.h ARM: EXYNOS: Add MFC device tree support 2012-10-19 10:26:31 +09:00
nand-core.h ARM: SAMSUNG: Add setname core function for S3C24XX NAND 2010-10-18 19:56:45 +09:00
onenand-core.h ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
pll.h ARM: SAMSUNG: Consolidate plat/pll.h 2011-10-04 19:48:42 +09:00
pm.h ARM: EXYNOS: Add support for rtc wakeup 2012-11-28 07:42:05 +09:00
pwm-clock.h ARM: SAMSUNG: Consolidate plat/pwm-clock.h 2011-10-04 19:48:41 +09:00
regs-ac97.h
regs-adc.h ARM: SAMSUNG: Add adc registers for S3C2443/S3C2416 2011-10-12 21:34:32 +09:00
regs-ata.h ARM: SAMSUNG: Add Compact Flash device support for Samsung SoCs 2010-08-05 18:32:50 +09:00
regs-dma.h ARM: S3C24XX: Reuse S3C2443 dma for S3C2416 2012-03-07 01:53:17 -08:00
regs-iic.h
regs-iis.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
regs-irqtype.h
regs-nand.h
regs-onenand.h ARM: SAMSUNG: Add platform support code for OneNAND controller 2010-05-20 17:48:36 +09:00
regs-rtc.h rtc-s3c: add variants for S3C2443 and S3C2416 2012-02-07 08:03:42 +09:00
regs-sdhci.h
regs-serial.h serial: samsung: merge probe() function from all SoC specific extensions 2011-12-23 10:07:00 +09:00
regs-spi.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
regs-srom.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
regs-timer.h
regs-udc.h ARM: SAMSUNG: Move S3C24XX header files to plat-samsung 2011-10-04 19:48:44 +09:00
regs-usb-hsotg-phy.h ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
regs-watchdog.h
rtc-core.h ARM: S3C2443/S3C2416: add s3c_rtc_setname and rename rtc devices 2012-02-07 08:03:43 +09:00
s3c244x.h ARM: SAMSUNG: Moving each SoC support header files 2011-10-04 19:48:43 +09:00
s3c2410.h ARM: S3C2410: move s3c2410_baseclk_add to clock.h 2012-01-31 20:06:43 +09:00
s3c2412.h ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to 2012-01-05 12:57:18 +00:00
s3c2416.h ARM: S3C24XX: add support for second irq set of S3C2416 2012-05-20 03:05:04 +09:00
s3c2443.h ARM: S3C24XX: move common S3C2443 clock definitions to clock.h 2012-01-31 20:06:42 +09:00
s5p-clock.h ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll 2012-05-16 07:03:41 +09:00
s5p-time.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
sdhci.h Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung 2012-05-13 06:48:21 +09:00
spi-core.h ARM: SAMSUNG: Add naming of s3c64xx-spi devices 2012-10-17 16:47:32 +09:00
tv-core.h ARM: S5P: add support for tv device 2011-10-04 18:58:26 +09:00
uncompress.h ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5 2012-03-14 02:13:05 -07:00
usb-phy.h ARM: SAMSUNG: Move S5P header files to plat-samsung 2011-10-04 19:48:45 +09:00
wakeup-mask.h ARM: SAMSUNG: Add support for interrupt wakeup-sources 2010-05-20 21:07:01 +09:00
watchdog-reset.h ARM: SAMSUNG: Should check for IS_ERR(clk) instead of NULL 2012-06-20 17:05:44 +09:00