ARM64: dts: rockchip: modify the name of the delay time for panel

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / rockchip / rk3368-p9.dts

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts
index d7ee5dd6f217689930444a24ac45fed78aa96569..3f6c65dbe7773122662e7fa19219f8678934673e 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-p9.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts
@@ -70,21 +70,6 @@
                };
        };
 
-       hdmi_sound: hdmi-sound {
-               status = "okay";
-               compatible = "simple-audio-card";
-               simple-audio-card,format = "i2s";
-               simple-audio-card,mclk-fs = <256>;
-               simple-audio-card,name = "rockchip,hdmi";
-
-               simple-audio-card,cpu {
-                       sound-dai = <&i2s_8ch>;
-               };
-               simple-audio-card,codec {
-                       sound-dai = <&hdmi>;
-               };
-       };
-
        sdio_pwrseq: sdio-pwrseq {
                compatible = "mmc-pwrseq-simple";
                clocks = <&rk818 1>;
@@ -103,7 +88,7 @@
 
        backlight: backlight {
                compatible = "pwm-backlight";
-               pwms = <&pwm0 0 25000 PWM_POLARITY_INVERTED>;
+               pwms = <&pwm0 0 25000 0>;
                brightness-levels = <
                          0   1   2   3   4   5   6   7
                          8   9  10  11  12  13  14  15
@@ -218,10 +203,6 @@
        };
 };
 
-&hdmi {
-       status = "okay";
-};
-
 &cpu_l0 {
        cpu-supply = <&syr827>;
 };
@@ -258,9 +239,31 @@
        logic-supply = <&vdd_logic>;
 };
 
+&rockchip_suspend {
+       status = "okay";
+       rockchip,sleep-mode-config = <
+               (0
+               | RKPM_SLP_ARMOFF
+               | RKPM_SLP_PMU_PLLS_PWRDN
+               | RKPM_SLP_PMU_PMUALIVE_32K
+               | RKPM_SLP_SFT_PLLS_DEEP
+               | RKPM_SLP_PMU_DIS_OSC
+               | RKPM_SLP_SFT_PD_NBSCUS
+               )
+       >;
+       rockchip,wakeup-config = <
+               (0
+               | RKPM_GPIO_WKUP_EN
+               | RKPM_USB_WKUP_EN
+               | RKPM_CLUSTER_L_WKUP_EN
+               )
+       >;
+};
+
 &emmc {
        bus-width = <8>;
        cap-mmc-highspeed;
+       mmc-hs200-1_8v;
        supports-emmc;
        disable-wp;
        non-removable;
@@ -309,13 +312,14 @@
                compatible = "silergy,syr827";
                status = "okay";
                reg = <0x40>;
-
                regulator-compatible = "fan53555-reg";
                regulator-name = "vdd_arm";
                regulator-min-microvolt = <712500>;
                regulator-max-microvolt = <1500000>;
                regulator-ramp-delay = <1000>;
                fcs,suspend-voltage-selector = <1>;
+               pinctrl-0 = <&vsel_gpio>;
+               vsel-gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
                regulator-always-on;
                regulator-boot-on;
                regulator-initial-state = <3>;
@@ -481,11 +485,11 @@
                                regulator-always-on;
                                regulator-boot-on;
                                regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
+                               regulator-max-microvolt = <1800000>;
                                regulator-name = "vccio_wl";
                                regulator-state-mem {
                                        regulator-on-in-suspend;
-                                       regulator-suspend-microvolt = <3300000>;
+                                       regulator-suspend-microvolt = <1800000>;
                                };
                        };
 
@@ -509,6 +513,22 @@
                                        regulator-on-in-suspend;
                                };
                        };
+
+                       boost_otg: DCDC_BOOST {
+                               regulator-name = "boost_otg";
+                               regulator-always-on;
+                               regulator-boot-on;
+                               regulator-min-microvolt = <5000000>;
+                               regulator-max-microvolt = <5000000>;
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                                       regulator-suspend-microvolt = <5000000>;
+                               };
+                       };
+
+                       otg_switch: OTG_SWITCH {
+                               regulator-name = "otg_switch";
+                       };
                };
 
                battery {
@@ -530,7 +550,7 @@
                        power_off_thresd = <3400>;
                        zero_algorithm_vol = <3850>;
                        fb_temperature = <115>;
-                       sample_res = <10>;
+                       sample_res = <20>;
                        max_soc_offset = <60>;
                        energy_mode = <0>;
                        monitor_sec = <5>;
@@ -655,21 +675,23 @@
        status = "okay";
 };
 
-&mipi_dsi_host {
+&dsi {
        status = "okay";
 
-       dsi_panel: panel@0 {
+       panel@0 {
                compatible = "simple-panel-dsi";
                reg = <0>;
                backlight = <&backlight>;
                enable-gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
+
                dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST)>;
                dsi,format = <MIPI_DSI_FMT_RGB888>;
                dsi,lanes = <4>;
 
-               delay,prepare = <120>;
+               prepare-delay-ms = <120>;
+               enable-delay-ms = <200>;
 
-               disp_timings: display-timings {
+               display-timings {
                        native-mode = <&timing0>;
 
                        timing0: timing0 {
@@ -691,7 +713,15 @@
 };
 
 &mipi_dphy {
-       rockchip,dsi-panel = <&dsi_panel>;
+       status = "okay";
+};
+
+&route_dsi {
+       status = "okay";
+};
+
+&tsadc {
+       tsadc-supply = <&syr827>;
        status = "okay";
 };
 
@@ -700,6 +730,9 @@
                pmic_int_l: pmic-int-l {
                        rockchip,pins = <RK_GPIO0 1 RK_FUNC_GPIO &pcfg_pull_up>;
                };
+               vsel_gpio: vsel-gpio {
+                       rockchip,pins = <0 0 RK_FUNC_GPIO &pcfg_pull_down>;
+               };
        };
 
        mpu6500 {