On Sun, Jan 24, 2016 at 12:36:39AM +0200, Aaro Koskinen wrote:
> 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: Rick Thomas <rbthomas@xxxxxxxxx>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
It would be good to have a Tested-by: from Rick.
Reviewed-by: Andrew Lunn <andrew@xxxxxxx>
Andrew
> ---
> arch/arm/boot/dts/kirkwood-openrd-client.dts | 6 +++++-
> arch/arm/boot/dts/kirkwood.dtsi | 2 +-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/kirkwood-openrd-client.dts b/arch/arm/boot/dts/kirkwood-openrd-client.dts
> index 887b9c1..96ff59d 100644
> --- a/arch/arm/boot/dts/kirkwood-openrd-client.dts
> +++ b/arch/arm/boot/dts/kirkwood-openrd-client.dts
> @@ -20,6 +20,9 @@
> compatible = "marvell,openrd-client", "marvell,openrd", "marvell,kirkwood-88f6281", "marvell,kirkwood";
>
> ocp@f1000000 {
> + audio-controller@a0000 {
> + status = "okay";
> + };
> i2c@11000 {
> status = "okay";
> clock-frequency = <400000>;
> @@ -27,6 +30,7 @@
> cs42l51: cs42l51@4a {
> compatible = "cirrus,cs42l51";
> reg = <0x4a>;
> + #sound-dai-cells = <0>;
> };
> };
> };
> @@ -37,7 +41,7 @@
> simple-audio-card,mclk-fs = <256>;
>
> simple-audio-card,cpu {
> - sound-dai = <&audio0>;
> + sound-dai = <&audio0 0>;
> };
>
> simple-audio-card,codec {
> diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
> index 7b5a4a1..7445a15 100644
> --- a/arch/arm/boot/dts/kirkwood.dtsi
> +++ b/arch/arm/boot/dts/kirkwood.dtsi
> @@ -381,7 +381,7 @@
>
> audio0: audio-controller@a0000 {
> compatible = "marvell,kirkwood-audio";
> - #sound-dai-cells = <0>;
> + #sound-dai-cells = <1>;
> reg = <0xa0000 0x2210>;
> interrupts = <24>;
> clocks = <&gate_clk 9>;
> --
> 2.4.0
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
