63 lines
1.8 KiB
Diff
63 lines
1.8 KiB
Diff
From 6cf99b581367b1b9e1f1cf8b098ffafcacd683da Mon Sep 17 00:00:00 2001
|
|
From: Samuel Holland <samuel@sholland.org>
|
|
Date: Mon, 17 Feb 2020 21:37:13 -0600
|
|
Subject: [PATCH 305/323] arm64: dts: allwinner: a64: Allow multiple DAI links
|
|
|
|
simple-audio-card supports either a single DAI link at the top level, or
|
|
subnodes with one or more DAI links. To use the secondary AIFs on the
|
|
codec, we need to add additional DAI links to the same sound card, so we
|
|
need to use the other binding.
|
|
|
|
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
|
---
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 23 +++++++++++--------
|
|
1 file changed, 14 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
|
index 511ac305d..b6d8013b2 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
|
@@ -157,12 +157,10 @@ scpi_protocol: scpi {
|
|
};
|
|
|
|
sound: sound {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
compatible = "simple-audio-card";
|
|
simple-audio-card,name = "sun50i-a64-audio";
|
|
- simple-audio-card,format = "i2s";
|
|
- simple-audio-card,frame-master = <&cpudai>;
|
|
- simple-audio-card,bitclock-master = <&cpudai>;
|
|
- simple-audio-card,mclk-fs = <128>;
|
|
simple-audio-card,aux-devs = <&codec_analog>;
|
|
simple-audio-card,routing =
|
|
"Left DAC", "DACL",
|
|
@@ -171,12 +169,19 @@ sound: sound {
|
|
"ADCR", "Right ADC";
|
|
status = "disabled";
|
|
|
|
- cpudai: simple-audio-card,cpu {
|
|
- sound-dai = <&dai>;
|
|
- };
|
|
+ simple-audio-card,dai-link@0 {
|
|
+ format = "i2s";
|
|
+ frame-master = <&link0_cpu>;
|
|
+ bitclock-master = <&link0_cpu>;
|
|
+ mclk-fs = <128>;
|
|
+
|
|
+ link0_cpu: cpu {
|
|
+ sound-dai = <&dai>;
|
|
+ };
|
|
|
|
- link_codec: simple-audio-card,codec {
|
|
- sound-dai = <&codec 0>;
|
|
+ link0_codec: codec {
|
|
+ sound-dai = <&codec 0>;
|
|
+ };
|
|
};
|
|
};
|
|
|
|
--
|
|
2.34.0
|
|
|