ARM64: dts: rk3399: add clock-latency-ns for each opp

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

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
index 4bcda1415038ed040cd60b784850ca38df2b8465..a1fffffbb09ae5a28fe456afcfa26efe3cc0a15f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
@@ -147,7 +147,7 @@
        };
 
        hdmi_sound: hdmi-sound {
-               status = "okay";
+               status = "disabled";
                compatible = "simple-audio-card";
                simple-audio-card,format = "i2s";
                simple-audio-card,mclk-fs = <256>;
@@ -193,6 +193,8 @@
 
        wireless-bluetooth {
                compatible = "bluetooth-platdata";
+               clocks = <&rk808 1>;
+               clock-names = "ext_clock";
                /* wifi-bt-power-toggle; */
                uart_rts_gpios = <&gpio2 19 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default", "rts_gpio";
@@ -204,21 +206,26 @@
                BT,wake_host_irq = <&gpio0 4 GPIO_ACTIVE_HIGH>;
                status = "okay";
        };
+
+       test-power {
+               status = "okay";
+       };
 };
 
 &sdmmc {
        clock-frequency = <100000000>;
-       clock-freq-min-max = <400000 100000000>;
+       clock-freq-min-max = <100000 100000000>;
        supports-sd;
        bus-width = <4>;
        cap-mmc-highspeed;
        cap-sd-highspeed;
        disable-wp;
        num-slots = <1>;
-       sd-uhs-sdr104;
+       //sd-uhs-sdr104;
        vqmmc-supply = <&vcc_sd>;
        pinctrl-names = "default";
        pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
+       card-detect-delay = <800>;
        status = "okay";
 };
 
@@ -283,26 +290,32 @@
        opp@600000000 {
                opp-hz = /bits/ 64 <600000000>;
                opp-microvolt = <800000>;
+               clock-latency-ns = <40000>;
        };
        opp@816000000 {
                opp-hz = /bits/ 64 <816000000>;
                opp-microvolt = <800000>;
+               clock-latency-ns = <40000>;
        };
        opp@1008000000 {
                opp-hz = /bits/ 64 <1008000000>;
                opp-microvolt = <875000>;
+               clock-latency-ns = <40000>;
        };
        opp@1200000000 {
                opp-hz = /bits/ 64 <1200000000>;
                opp-microvolt = <925000>;
+               clock-latency-ns = <40000>;
        };
        opp@1416000000 {
                opp-hz = /bits/ 64 <1416000000>;
                opp-microvolt = <1050000>;
+               clock-latency-ns = <40000>;
        };
        opp@1512000000 {
                opp-hz = /bits/ 64 <1512000000>;
-               opp-microvolt = <1075000>;
+               opp-microvolt = <1125000>;
+               clock-latency-ns = <40000>;
        };
 };
 
@@ -315,34 +328,42 @@
        opp@600000000 {
                opp-hz = /bits/ 64 <600000000>;
                opp-microvolt = <800000>;
+               clock-latency-ns = <40000>;
        };
        opp@816000000 {
                opp-hz = /bits/ 64 <816000000>;
                opp-microvolt = <825000>;
+               clock-latency-ns = <40000>;
        };
        opp@1008000000 {
                opp-hz = /bits/ 64 <1008000000>;
                opp-microvolt = <875000>;
+               clock-latency-ns = <40000>;
        };
        opp@1200000000 {
                opp-hz = /bits/ 64 <1200000000>;
                opp-microvolt = <950000>;
+               clock-latency-ns = <40000>;
        };
        opp@1416000000 {
                opp-hz = /bits/ 64 <1416000000>;
                opp-microvolt = <1025000>;
+               clock-latency-ns = <40000>;
        };
        opp@1608000000 {
                opp-hz = /bits/ 64 <1608000000>;
                opp-microvolt = <1100000>;
+               clock-latency-ns = <40000>;
        };
        opp@1800000000 {
                opp-hz = /bits/ 64 <1800000000>;
                opp-microvolt = <1175000>;
+               clock-latency-ns = <40000>;
        };
        opp@1992000000 {
                opp-hz = /bits/ 64 <1992000000>;
                opp-microvolt = <1250000>;
+               clock-latency-ns = <40000>;
        };
 };
 
@@ -433,19 +454,15 @@
        };
        opp@500000000 {
                opp-hz = /bits/ 64 <500000000>;
-               opp-microvolt = <850000>;
+               opp-microvolt = <900000>;
        };
        opp@600000000 {
                opp-hz = /bits/ 64 <600000000>;
                opp-microvolt = <900000>;
        };
-       opp@700000000 {
-               opp-hz = /bits/ 64 <700000000>;
-               opp-microvolt = <950000>;
-       };
        opp@800000000 {
                opp-hz = /bits/ 64 <800000000>;
-               opp-microvolt = <975000>;
+               opp-microvolt = <1000000>;
        };
 };
 
@@ -484,6 +501,7 @@
                regulator-always-on;
                regulator-boot-on;
                vin-supply = <&vcc_sys>;
+               regulator-initial-mode = <1>; /* 1:force PWM 2:auto */
                regulator-state-mem {
                        regulator-off-in-suspend;
                };
@@ -519,6 +537,7 @@
                                regulator-name = "vdd_center";
                                regulator-min-microvolt = <750000>;
                                regulator-max-microvolt = <1350000>;
+                               regulator-ramp-delay = <6001>;
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-state-mem {
@@ -530,6 +549,7 @@
                                regulator-name = "vdd_cpu_l";
                                regulator-min-microvolt = <750000>;
                                regulator-max-microvolt = <1350000>;
+                               regulator-ramp-delay = <6001>;
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-state-mem {
@@ -708,16 +728,39 @@
        status = "okay";
 };
 
+&threshold {
+       temperature = <85000>;
+};
+
+&target {
+       temperature = <100000>;
+};
+
+&soc_crit {
+       temperature = <105000>;
+};
+
+&tcphy0 {
+       extcon = <&fusb0>;
+       status = "okay";
+};
+
+&tcphy1 {
+       status = "okay";
+};
+
 &tsadc {
        /* tshut mode 0:CRU 1:GPIO */
        rockchip,hw-tshut-mode = <1>;
        /* tshut polarity 0:LOW 1:HIGH */
        rockchip,hw-tshut-polarity = <1>;
+       rockchip,hw-tshut-temp = <110000>;
        status = "okay";
 };
 
 &u2phy0 {
        status = "okay";
+       extcon = <&fusb0>;
 
        u2phy0_otg: otg-port {
                status = "okay";
@@ -769,11 +812,12 @@
 };
 
 &usbdrd3_0 {
+       extcon = <&fusb0>;
        status = "okay";
 };
 
 &usbdrd_dwc3_0 {
-       dr_mode = "peripheral";
+       dr_mode = "otg";
        status = "okay";
 };
 
@@ -901,8 +945,9 @@
        snps,reset-delays-us = <0 10000 50000>;
        assigned-clocks = <&cru SCLK_RMII_SRC>;
        assigned-clock-parents = <&clkin_gmac>;
-       pinctrl-names = "default";
+       pinctrl-names = "default", "sleep";
        pinctrl-0 = <&rgmii_pins>;
+       pinctrl-1 = <&rgmii_sleep_pins>;
        tx_delay = <0x28>;
        rx_delay = <0x11>;
        status = "okay";
@@ -924,14 +969,32 @@
        status = "okay";
 };
 
+&vopl_rk_fb {
+       status = "okay";
+};
+
 &fb {
-       rockchip,disp-mode = <NO_DUAL>;
        rockchip,disp-policy = <DISPLAY_POLICY_BOX>;
 };
 
 &hdmi_rk_fb {
        status = "okay";
        rockchip,hdmi_video_source = <DISPLAY_SOURCE_LCDC0>;
+       rockchip,phy_table =
+               <165000000 0 0 17 18 18 18>,
+               <340000000 0 2 17 14 14 14>,
+               <594000000 0 2 17  9  9  9>;
+};
+
+&cdn_dp_sound {
+       status = "okay";
+};
+
+&cdn_dp_fb {
+       status = "okay";
+       extcon = <&fusb0>;
+       phys = <&tcphy0_dp>;
+       dp_vop_sel = <DISPLAY_SOURCE_LCDC1>;
 };
 
 &i2s2 {
@@ -966,4 +1029,19 @@
                                <1 21 RK_FUNC_GPIO &pcfg_pull_up>;
                };
        };
+
+       gmac {
+               rgmii_sleep_pins: rgmii-sleep-pins {
+                       rockchip,pins =
+                               <3 15 RK_FUNC_GPIO &pcfg_output_low>;
+               };
+       };
+};
+
+&pvtm {
+       status = "okay";
+};
+
+&pmu_pvtm {
+       status = "okay";
 };