Commit a6b33451 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper

ARM: mvebu: use simple-card DT binding for audio on Armada 370 DB

This commit modifies the Armada 370 and Armada 370 DB Device Tree
descriptions to use the simple-card DT binding to describe the audio
complex of the Armada 370 DB instead of a custom audio machine driver.

To do so, it:

 - Adds the sound-dai-cells properties to the CS42L51 node, the audio
   controller node and the SPDIF in/out nodes.

 - Completely changes the description of the sound complex to use the
   "simple-audio-card" DT binding instead of the
   "marvell,a370db-audio" DT binding.

 - Fixes the indentation to properly use tabs instead of spaces.
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1414512524-24466-6-git-send-email-thomas.petazzoni@free-electrons.comSigned-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent b4607572
...@@ -75,6 +75,7 @@ i2c@11000 { ...@@ -75,6 +75,7 @@ i2c@11000 {
clock-frequency = <100000>; clock-frequency = <100000>;
status = "okay"; status = "okay";
audio_codec: audio-codec@4a { audio_codec: audio-codec@4a {
#sound-dai-cells = <0>;
compatible = "cirrus,cs42l51"; compatible = "cirrus,cs42l51";
reg = <0x4a>; reg = <0x4a>;
}; };
...@@ -143,17 +144,60 @@ pcie@2,0 { ...@@ -143,17 +144,60 @@ pcie@2,0 {
}; };
sound { sound {
compatible = "marvell,a370db-audio"; compatible = "simple-audio-card";
marvell,audio-controller = <&audio_controller>; simple-audio-card,name = "Armada 370 DB Audio";
marvell,audio-codec = <&audio_codec &spdif_out &spdif_in>; simple-audio-card,mclk-fs = <256>;
simple-audio-card,widgets =
"Headphone", "Out Jack",
"Line", "In Jack";
simple-audio-card,routing =
"Out Jack", "HPL",
"Out Jack", "HPR",
"AIN1L", "In Jack",
"AIN1L", "In Jack";
status = "okay"; status = "okay";
simple-audio-card,dai-link@0 {
format = "i2s";
cpu {
sound-dai = <&audio_controller 0>;
};
codec {
sound-dai = <&audio_codec>;
};
};
simple-audio-card,dai-link@1 {
format = "i2s";
cpu {
sound-dai = <&audio_controller 1>;
};
codec {
sound-dai = <&spdif_out>;
};
};
simple-audio-card,dai-link@2 {
format = "i2s";
cpu {
sound-dai = <&audio_controller 1>;
};
codec {
sound-dai = <&spdif_in>;
};
};
}; };
spdif_out: spdif-out { spdif_out: spdif-out {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit"; compatible = "linux,spdif-dit";
}; };
spdif_in: spdif-in { spdif_in: spdif-in {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dir"; compatible = "linux,spdif-dir";
}; };
}; };
...@@ -250,6 +250,7 @@ cpurst@20800 { ...@@ -250,6 +250,7 @@ cpurst@20800 {
}; };
audio_controller: audio-controller@30000 { audio_controller: audio-controller@30000 {
#sound-dai-cells = <1>;
compatible = "marvell,armada370-audio"; compatible = "marvell,armada370-audio";
reg = <0x30000 0x4000>; reg = <0x30000 0x4000>;
interrupts = <93>; interrupts = <93>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment