Commit 34cabc2a authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Gregory CLEMENT

ARM: dts: kirkwood: fix audio for OpenRD clients

Fix audio on kirkwood-openrd-client:

1) The audio-controller was left disabled.

2) The probe fails because cs42l51 is missing #sound-dai-cells.

	/sound/simple-audio-card,codec: could not get #sound-dai-cells for /ocp@f1000000/i2c@11000/cs42l51@4a
	asoc-simple-card sound: parse error -22
	asoc-simple-card: probe of sound failed with error -22

3) The mapping is incorrect:

	asoc-simple-card sound: cs42l51-hifi <-> spdif mapping ok

   should be:

	asoc-simple-card sound: cs42l51-hifi <-> i2s mapping ok
Reported-by: default avatarRick Thomas <rbthomas@pobox.com>
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarRick Thomas <rbthomas@pobox.com>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent 39ac0979
...@@ -20,6 +20,9 @@ / { ...@@ -20,6 +20,9 @@ / {
compatible = "marvell,openrd-client", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood"; compatible = "marvell,openrd-client", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
ocp@f1000000 { ocp@f1000000 {
audio-controller@a0000 {
status = "okay";
};
i2c@11000 { i2c@11000 {
status = "okay"; status = "okay";
clock-frequency = <400000>; clock-frequency = <400000>;
...@@ -27,6 +30,7 @@ i2c@11000 { ...@@ -27,6 +30,7 @@ i2c@11000 {
cs42l51: cs42l51@4a { cs42l51: cs42l51@4a {
compatible = "cirrus,cs42l51"; compatible = "cirrus,cs42l51";
reg = <0x4a>; reg = <0x4a>;
#sound-dai-cells = <0>;
}; };
}; };
}; };
...@@ -37,7 +41,7 @@ sound { ...@@ -37,7 +41,7 @@ sound {
simple-audio-card,mclk-fs = <256>; simple-audio-card,mclk-fs = <256>;
simple-audio-card,cpu { simple-audio-card,cpu {
sound-dai = <&audio0>; sound-dai = <&audio0 0>;
}; };
simple-audio-card,codec { simple-audio-card,codec {
......
...@@ -381,7 +381,7 @@ sata_phy1: sata-phy@84000 { ...@@ -381,7 +381,7 @@ sata_phy1: sata-phy@84000 {
audio0: audio-controller@a0000 { audio0: audio-controller@a0000 {
compatible = "marvell,kirkwood-audio"; compatible = "marvell,kirkwood-audio";
#sound-dai-cells = <0>; #sound-dai-cells = <1>;
reg = <0xa0000 0x2210>; reg = <0xa0000 0x2210>;
interrupts = <24>; interrupts = <24>;
clocks = <&gate_clk 9>; clocks = <&gate_clk 9>;
......
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