Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / allwinner / sun50i-a64-pinephone.dtsi

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
index 79adea3..5b44a97 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
@@ -25,6 +25,11 @@
                /* Backlight configuration differs per PinePhone revision. */
        };
 
+       bt_sco_codec: bt-sco-codec {
+               #sound-dai-cells = <1>;
+               compatible = "linux,bt-sco";
+       };
+
        chosen {
                stdout-path = "serial0:115200n8";
        };
@@ -91,6 +96,8 @@
 };
 
 &codec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&aif3_pins>;
        status = "okay";
 };
 
@@ -426,6 +433,7 @@
 
 &sound {
        status = "okay";
+       simple-audio-card,name = "PinePhone";
        simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>;
        simple-audio-card,widgets = "Microphone", "Headset Microphone",
                                    "Microphone", "Internal Microphone",
@@ -447,6 +455,23 @@
                        "MIC1", "Internal Microphone",
                        "Headset Microphone", "HBIAS",
                        "MIC2", "Headset Microphone";
+
+       simple-audio-card,dai-link@2 {
+               format = "dsp_a";
+               frame-master = <&link2_codec>;
+               bitclock-master = <&link2_codec>;
+               bitclock-inversion;
+
+               link2_cpu: cpu {
+                       sound-dai = <&bt_sco_codec 0>;
+               };
+
+               link2_codec: codec {
+                       sound-dai = <&codec 2>;
+                       dai-tdm-slot-num = <1>;
+                       dai-tdm-slot-width = <32>;
+               };
+       };
 };
 
 &uart0 {