diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 17:52:41 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-12 17:52:41 +0200 |
| commit | decf7abcc97444ecd2d3cf278f5cc8093f33f49a (patch) | |
| tree | 735057e504a1787a741f6a15fac7dbe2f461e887 /Documentation/devicetree | |
| parent | Merge git://www.linux-watchdog.org/linux-watchdog (diff) | |
| parent | Merge tag 'asoc-v3.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff) | |
| download | linux-decf7abcc97444ecd2d3cf278f5cc8093f33f49a.tar.xz linux-decf7abcc97444ecd2d3cf278f5cc8093f33f49a.zip | |
Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"A few last-minute fixes for 3.12-rc1. All patches are driver
specific.
- HD-audio fixes: MacBook 6,1/6,2 speaker fix, ASUS TX300 dock
speaker fix, Toshiba Satellite irq fix, Haswell HDMI audio
cleanups)
- ASoC fixes: atmel irq fix, fsl DT fix, mc13783 spi fix, kirkwood
compatible string change, etc"
* tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: mc13783: add spi errata fix
ASoC: rsnd: fixup flag name of rsnd_scu_platform_info
ALSA: hda - Add CS4208 codec support for MacBook 6,1 and 6,2
ALSA: hda - Add Toshiba Satellite C870 to MSI blacklist
ASoC: fsl_spdif: Select regmap-mmio
ALSA: hda - unmute pin amplifier in infoframe setup for Haswell
ALSA: hda - define is_haswell() to check if a display audio codec is Haswell
ALSA: hda - Add dock speaker support for ASUS TX300
ASoC: kirkwood: change the compatible string of the kirkwood-i2s driver
ASoC: atmel: disable error interrupt
ASoC: fsl: imx-audmux: Do not call imx_audmux_parse_dt_defaults() on non-dt kernel
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/sound/mvebu-audio.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/sound/mvebu-audio.txt b/Documentation/devicetree/bindings/sound/mvebu-audio.txt index 7e5fd37c1b3f..f0062c5871b4 100644 --- a/Documentation/devicetree/bindings/sound/mvebu-audio.txt +++ b/Documentation/devicetree/bindings/sound/mvebu-audio.txt @@ -2,13 +2,17 @@ Required properties: -- compatible: "marvell,mvebu-audio" +- compatible: + "marvell,kirkwood-audio" for Kirkwood platforms + "marvell,dove-audio" for Dove platforms - reg: physical base address of the controller and length of memory mapped region. -- interrupts: list of two irq numbers. - The first irq is used for data flow and the second one is used for errors. +- interrupts: + with "marvell,kirkwood-audio", the audio interrupt + with "marvell,dove-audio", a list of two interrupts, the first for + the data flow, and the second for errors. - clocks: one or two phandles. The first one is mandatory and defines the internal clock. @@ -21,7 +25,7 @@ Required properties: Example: i2s1: audio-controller@b4000 { - compatible = "marvell,mvebu-audio"; + compatible = "marvell,dove-audio"; reg = <0xb4000 0x2210>; interrupts = <21>, <22>; clocks = <&gate_clk 13>; |