arm64: dts: rk3399: rename android-next to android

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / rockchip / rk3399-tve1205g.dts

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
index 341f25bd5a40997747063b1bae268ccc196960c1..a16aae0c22ccae55895169d358f33c51b4308140 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
@@ -43,7 +43,7 @@
 /dts-v1/;
 #include <dt-bindings/pinctrl/rk.h>
 #include "rk3399.dtsi"
-#include "rk3399-android-next.dtsi"
+#include "rk3399-android.dtsi"
 #include "rk3399-opp.dtsi"
 #include <dt-bindings/sensor-dev.h>
 #include <dt-bindings/pwm/pwm.h>
@@ -184,19 +184,29 @@
                };
        };
 
-       spdif-sound {
+       sound {
+               compatible = "rockchip,cdndp-sound";
+               rockchip,cpu = <&i2s2>;
+               rockchip,codec = <&cdn_dp>;
+               status = "okay";
+       };
+
+       bt-sound {
                compatible = "simple-audio-card";
-               simple-audio-card,name = "rockchip,spdif";
+               simple-audio-card,format = "dsp_b";
+               simple-audio-card,bitclock-inversion = <1>;
+               simple-audio-card,mclk-fs = <256>;
+               simple-audio-card,name = "rockchip,bt";
                simple-audio-card,cpu {
-                       sound-dai = <&spdif>;
+                       sound-dai = <&i2s1>;
                };
                simple-audio-card,codec {
-                       sound-dai = <&spdif_out>;
+                       sound-dai = <&bt_sco>;
                };
        };
 
-       spdif_out: spdif-out {
-               compatible = "linux,spdif-dit";
+       bt_sco: bt-sco {
+               compatible = "delta,dfbmcs320";
                #sound-dai-cells = <0>;
        };
 
@@ -444,7 +454,16 @@
        #sound-dai-cells = <0>;
 };
 
+&i2s1 {
+       status = "okay";
+       rockchip,i2s-broken-burst-len;
+       rockchip,playback-channels = <2>;
+       rockchip,capture-channels = <2>;
+       #sound-dai-cells = <0>;
+};
+
 &i2s2 {
+       status = "okay";
        #sound-dai-cells = <0>;
 };
 
@@ -1040,7 +1059,7 @@
 
        hallsensor {
                mh248_irq_gpio: mh248-irq-gpio {
-                       rockchip,pins = <0 GPIO_A2 RK_FUNC_GPIO &pcfg_pull_up>;
+                       rockchip,pins = <0 GPIO_A1 RK_FUNC_GPIO &pcfg_pull_up>;
                };
        };