arm64: dts: rockchip: add dp audio support for rk3399-tve1205g

[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 ced31fb5ae66adc33f07cb281c257e72c411c371..343301944e8c8c1b9c33063c7340597218fae578 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
@@ -55,8 +55,9 @@
                compatible = "simple-panel";
                backlight = <&backlight>;
                power-supply = <&vcc3v3_s0>;
-               enable-gpios = <&gpio3 8 GPIO_ACTIVE_HIGH>;
+               enable-gpios = <&gpio3 GPIO_A0 GPIO_ACTIVE_HIGH>;
                bus-format = <MEDIA_BUS_FMT_RGB666_1X18>;
+               delay,prepare = <50>;
                ports {
                        panel_in_edp: endpoint {
                                remote-endpoint = <&edp_out_panel>;
@@ -183,6 +184,13 @@
                };
        };
 
+       sound {
+               compatible = "rockchip,cdndp-sound";
+               rockchip,cpu = <&i2s2>;
+               rockchip,codec = <&cdn_dp>;
+               status = "okay";
+       };
+
        spdif-sound {
                compatible = "simple-audio-card";
                simple-audio-card,name = "rockchip,spdif";
@@ -285,8 +293,13 @@
 
        uboot-charge {
                compatible = "rockchip,uboot-charge";
-               rockchip,uboot-charge-on = <0>;
-               rockchip,android-charge-on = <1>;
+               rockchip,uboot-charge-on = <1>;
+               rockchip,android-charge-on = <0>;
+               rockchip,uboot-exit-charge-level = <2>;
+               rockchip,uboot-low-power-level = <1>;
+               rockchip,uboot-charge-brightness = <0>;
+               max-input-voltage = <20000>;
+               max-input-current = <6000>;
        };
 
        vibrator {
@@ -403,6 +416,10 @@
        };
 };
 
+&edp_in_vopl {
+       status = "disabled";
+};
+
 &emmc_phy {
        status = "okay";
 };
@@ -416,6 +433,15 @@
        status = "disabled";
 };
 
+&cdn_dp {
+       status = "okay";
+       extcon = <&fusb0>, <&fusb1>;
+};
+
+&dp_in_vopb {
+       status = "disabled";
+};
+
 &i2s0 {
        status = "okay";
        rockchip,i2s-broken-burst-len;
@@ -426,6 +452,7 @@
 };
 
 &i2s2 {
+       status = "okay";
        #sound-dai-cells = <0>;
 };
 
@@ -741,8 +768,6 @@
                pd-charge-only = <1>;
                typec0-enable-gpios = <&gpio1 GPIO_A3 GPIO_ACTIVE_HIGH>;
                typec1-enable-gpios = <&gpio1 GPIO_A4 GPIO_ACTIVE_HIGH>;
-               typec0-discharge-gpios = <&gpio0 GPIO_B4 GPIO_ACTIVE_HIGH>;
-               typec1-discharge-gpios = <&gpio0 GPIO_B5 GPIO_ACTIVE_HIGH>;
        };
 };
 
@@ -757,9 +782,12 @@
                reg = <0x22>;
                pinctrl-names = "default";
                pinctrl-0 = <&fusb1_int>;
-               vbus-5v-gpios = <&gpio4 GPIO_D6 GPIO_ACTIVE_LOW>;
+               vbus-5v-gpios = <&gpio4 GPIO_D6 GPIO_ACTIVE_HIGH>;
                int-n-gpios = <&gpio1 GPIO_B5 GPIO_ACTIVE_HIGH>;
+               discharge-gpios = <&gpio0 GPIO_B5 GPIO_ACTIVE_HIGH>;
                charge-dev = <&bq25700>;
+               support-uboot-charge = <1>;
+               port-num = <1>;
                status = "okay";
        };
 };
@@ -775,9 +803,12 @@
                reg = <0x22>;
                pinctrl-names = "default";
                pinctrl-0 = <&fusb0_int>;
-               vbus-5v-gpios = <&gpio4 GPIO_D5 GPIO_ACTIVE_LOW>;
+               vbus-5v-gpios = <&gpio4 GPIO_D5 GPIO_ACTIVE_HIGH>;
                int-n-gpios = <&gpio1 GPIO_A2 GPIO_ACTIVE_HIGH>;
+               discharge-gpios = <&gpio0 GPIO_B4 GPIO_ACTIVE_HIGH>;
                charge-dev = <&bq25700>;
+               support-uboot-charge = <1>;
+               port-num = <0>;
                status = "okay";
        };
 };
@@ -794,6 +825,18 @@
        status = "disabled";
 };
 
+&pcie_phy {
+       status = "okay";
+};
+
+&pcie0 {
+       ep-gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>;
+       num-lanes = <4>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pcie_clkreqn_cpm>;
+       status = "okay";
+};
+
 &pmu_io_domains {
        status = "okay";
        pmu1830-supply = <&vcc_1v8>;
@@ -1059,11 +1102,13 @@
        fusb30x {
                fusb0_int: fusb0-int {
                        rockchip,pins =
-                               <1 GPIO_A2 RK_FUNC_GPIO &pcfg_pull_up>;
+                               <1 GPIO_A2 RK_FUNC_GPIO &pcfg_pull_up>,
+                               <0 GPIO_B4 RK_FUNC_GPIO &pcfg_pull_up>;
                };
                fusb1_int: fusb1-int {
                        rockchip,pins =
-                               <1 GPIO_B5 RK_FUNC_GPIO &pcfg_pull_up>;
+                               <1 GPIO_B5 RK_FUNC_GPIO &pcfg_pull_up>,
+                               <0 GPIO_B5 RK_FUNC_GPIO &pcfg_pull_up>;
                };
        };
 };