diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-09-11 06:38:45 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-09-11 06:38:45 -0400 |
commit | 3d0049e8529adaa36c38a7b400792f6c37b66c92 (patch) | |
tree | 7d2e30a5e3f12207305ffc76d80d310c0a95fdcc /Documentation/devicetree | |
parent | be8cf44526d8972c2dbf6e561162dad924a712a5 (diff) | |
parent | 2ae2caff8348378c9e464353e9860ee97583c00b (diff) |
Merge tag 'asoc-v3.12-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.12
A few small fixes, nothing with any broad impact but all useful for the
affected systems. The Kirkwood compatible string change is fixing up a
string just added in the merge window so that we don't get any changes
in released kernels.
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 @@ | |||
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | 4 | ||
5 | - compatible: "marvell,mvebu-audio" | 5 | - compatible: |
6 | "marvell,kirkwood-audio" for Kirkwood platforms | ||
7 | "marvell,dove-audio" for Dove platforms | ||
6 | 8 | ||
7 | - reg: physical base address of the controller and length of memory mapped | 9 | - reg: physical base address of the controller and length of memory mapped |
8 | region. | 10 | region. |
9 | 11 | ||
10 | - interrupts: list of two irq numbers. | 12 | - interrupts: |
11 | The first irq is used for data flow and the second one is used for errors. | 13 | with "marvell,kirkwood-audio", the audio interrupt |
14 | with "marvell,dove-audio", a list of two interrupts, the first for | ||
15 | the data flow, and the second for errors. | ||
12 | 16 | ||
13 | - clocks: one or two phandles. | 17 | - clocks: one or two phandles. |
14 | The first one is mandatory and defines the internal clock. | 18 | The first one is mandatory and defines the internal clock. |
@@ -21,7 +25,7 @@ Required properties: | |||
21 | Example: | 25 | Example: |
22 | 26 | ||
23 | i2s1: audio-controller@b4000 { | 27 | i2s1: audio-controller@b4000 { |
24 | compatible = "marvell,mvebu-audio"; | 28 | compatible = "marvell,dove-audio"; |
25 | reg = <0xb4000 0x2210>; | 29 | reg = <0xb4000 0x2210>; |
26 | interrupts = <21>, <22>; | 30 | interrupts = <21>, <22>; |
27 | clocks = <&gate_clk 13>; | 31 | clocks = <&gate_clk 13>; |