aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/sound/mvebu-audio.txt12
-rw-r--r--sound/soc/kirkwood/kirkwood-i2s.c3
2 files changed, 10 insertions, 5 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
3Required properties: 3Required 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:
21Example: 25Example:
22 26
23i2s1: audio-controller@b4000 { 27i2s1: 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>;
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 7fce340ab3ef..0f3d73d4ef48 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -559,7 +559,8 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev)
559 559
560#ifdef CONFIG_OF 560#ifdef CONFIG_OF
561static struct of_device_id mvebu_audio_of_match[] = { 561static struct of_device_id mvebu_audio_of_match[] = {
562 { .compatible = "marvell,mvebu-audio" }, 562 { .compatible = "marvell,kirkwood-audio" },
563 { .compatible = "marvell,dove-audio" },
563 { } 564 { }
564}; 565};
565MODULE_DEVICE_TABLE(of, mvebu_audio_of_match); 566MODULE_DEVICE_TABLE(of, mvebu_audio_of_match);