Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / hisilicon / hi6220-hikey.dts

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 5cdfe73..2b52630 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -468,6 +468,11 @@
                        method = "smc";
                };
        };
+
+       sound_card {
+               compatible = "audio-graph-card";
+               dais = <&i2s0_port0>;
+       };
 };
 
 &uart2 {
@@ -508,10 +513,33 @@
                interrupts = <1 2>;
                pd-gpio = <&gpio0 4 0>;
                adi,dsi-lanes = <4>;
+               #sound-dai-cells = <0>;
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       port@0 {
+                               adv7533_in: endpoint {
+                                       remote-endpoint = <&dsi_out0>;
+                               };
+                       };
+                       port@2 {
+                               reg = <2>;
+                               codec_endpoint: endpoint {
+                                       remote-endpoint = <&i2s0_cpu_endpoint>;
+                               };
+                       };
+               };
+       };
+};
 
-               port {
-                       adv7533_in: endpoint {
-                               remote-endpoint = <&dsi_out0>;
+&i2s0 {
+
+       ports {
+               i2s0_port0: port@0 {
+                       i2s0_cpu_endpoint: endpoint {
+                               remote-endpoint = <&codec_endpoint>;
+                               dai-format = "i2s";
                        };
                };
        };