android_kernel_motorola_sm6225/Documentation/devicetree/bindings
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
..
arm ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
ata ARM: EXYNOS: DT Support for SATA and SATA PHY 2012-11-20 21:02:17 +09:00
bus ARM: dts: OMAP4: add *reg* property for ocp2scp 2012-10-29 16:56:30 +01:00
c6x C6X: devicetree support 2011-10-06 19:47:33 -04:00
clock ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
cpufreq cpufreq: SPEAr: Add CPUFreq driver 2012-11-27 14:05:26 +01:00
crypto ARM: soc: late platform updates 2012-10-07 20:55:16 +09:00
dma Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-10-02 19:13:12 -07:00
drm/exynos ARM: dts: add device tree support for exynos5 hdmiddc 2012-10-29 21:51:47 +09:00
fb video: mxsfb: add simple device tree probe 2012-07-03 13:22:37 +08:00
gpio ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
hwmon hwmon: Versatile Express hwmon driver 2012-10-16 17:12:35 +01:00
i2c ARM: arm-soc: Cleanups on various subarchitectures 2012-12-12 11:51:39 -08:00
input Merge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt 2012-11-06 07:31:40 -08:00
interrupt-controller irqchip: sunxi: Add irq controller driver 2012-11-16 21:56:51 +01:00
iommu iommu/tegra: smmu: Add device tree support for SMMU 2012-06-25 13:50:43 +02:00
leds devicetree/bindings: Move gpio-leds binding into leds directory 2012-12-06 09:53:13 +00:00
lpddr2 Documentation: dt: device tree bindings for LPDDR2 memories 2012-09-07 19:18:37 +02:00
media ARM: EXYNOS: Add MFC device tree support 2012-10-19 10:26:31 +09:00
memory-controllers/ti Documentation: dt: emif: device tree bindings for TI's EMIF sdram controller 2012-09-07 19:18:38 +02:00
mfd MFD bits for the 3.7 merge window. 2012-10-05 12:01:30 +09:00
mips/cavium MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
misc ARM: at91: atmel-ssc: add device tree support 2012-11-07 09:23:49 +01:00
mmc mmc: dt: add no-1-8-v device tree flag 2012-12-06 13:55:05 -05:00
mtd UAPI Disintegration 2012-10-09 2012-10-09 15:04:25 +01:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-11-25 12:49:17 -05:00
nvec dt: name all Tegra binding docs consistently 2012-06-11 11:48:42 -06:00
pci
pinctrl ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
power PM / OPP: Initialize OPP table from device tree 2012-09-09 22:06:33 +02:00
power_supply max17042_battery: Make it possible to instantiate driver from DT 2012-03-26 20:40:51 +04:00
powerpc powerpc: Update Integrated Flash controller device tree bindings 2012-09-12 14:57:10 -05:00
pwm pwm: Changes for v3.7-rc1 2012-10-10 20:15:24 +09:00
regulator MFD bits for the 3.7 merge window. 2012-10-05 12:01:30 +09:00
rtc ARM: arm-soc: multiplatform conversion patches 2012-12-13 10:57:16 -08:00
serial devicetree: serial: Add documentation for imx serial 2012-09-06 11:01:46 -05:00
serio
sound Merge remote-tracking branch 'asoc/topic/omap' into asoc-next 2012-12-02 13:35:11 +09:00
spi Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-10-09 16:08:04 +09:00
staging staging: drm/imx: Add devicetree binding documentation 2012-09-21 09:17:06 -07:00
thermal Thermal: Add ST-Ericsson DB8500 thermal driver. 2012-11-15 20:50:34 +08:00
timer ARM: arm-soc: multiplatform conversion patches 2012-12-13 10:57:16 -08:00
tty/serial serial: mxs-auart: add the DMA support for mx28 2012-11-16 04:42:46 -08:00
usb ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
video MFD bits for the 3.7 merge window. 2012-10-05 12:01:30 +09:00
virtio virtio: Add platform bus driver for memory mapped virtio device 2011-11-02 11:41:01 +10:30
w1 onewire: w1-gpio: add DT bindings 2012-08-16 10:00:23 -07:00
watchdog ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
x86 x86: dt: Correct local apic documentation in device tree bindings 2011-02-28 09:58:06 +01:00
eeprom.txt
marvell.txt
open-pic.txt powerpc: Document the Open PIC device tree binding 2011-03-21 11:00:52 +11:00
resource-names.txt of/irq: Add interrupts-names property to name an irq resource 2012-01-04 00:33:15 -07:00
vendor-prefixes.txt ARM: arm-soc: device tree conversions and enablement 2012-12-13 10:39:26 -08:00
xilinx.txt