Merge tag 'pinctrl-v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / rockchip / rk3328-rock64.dts

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
index 040b36ef0dd2b7e7b3cd1cb280dcc94606b99e0f..2157a528276bffae23afbaf3152db66292b7817a 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -68,7 +68,8 @@
        sound {
                compatible = "audio-graph-card";
                label = "rockchip,rk3328";
-               dais = <&spdif_p0>;
+               dais = <&i2s1_p0
+                       &spdif_p0>;
        };
 
        spdif-dit {
@@ -83,6 +84,16 @@
        };
 };
 
+&codec {
+       status = "okay";
+
+       port@0 {
+               codec_p0_0: endpoint {
+                       remote-endpoint = <&i2s1_p0_0>;
+               };
+       };
+};
+
 &cpu0 {
        cpu-supply = <&vdd_arm>;
 };
@@ -245,6 +256,18 @@
        };
 };
 
+&i2s1 {
+       status = "okay";
+
+       i2s1_p0: port {
+               i2s1_p0_0: endpoint {
+                       dai-format = "i2s";
+                       mclk-fs = <256>;
+                       remote-endpoint = <&codec_p0_0>;
+               };
+       };
+};
+
 &io_domains {
        status = "okay";
 
@@ -292,7 +315,6 @@
 &spdif {
        pinctrl-0 = <&spdifm0_tx>;
        status = "okay";
-       #sound-dai-cells = <0>;
 
        spdif_p0: port {
                spdif_p0_0: endpoint {