rk3368-p9_818: dts: rename dc det pinctrl name and add virtual_power

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

diff --git a/arch/arm64/boot/dts/rk3368-p9_818.dts b/arch/arm64/boot/dts/rk3368-p9_818.dts
old mode 100644 (file)
new mode 100755 (executable)
index b15e2cd..773816c
--- a/arch/arm64/boot/dts/rk3368-p9_818.dts
+++ b/arch/arm64/boot/dts/rk3368-p9_818.dts
@@ -111,7 +111,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_i2s>;
-                               i2s-controller = <&i2s0>;
+                               audio-controller = <&i2s0>;
                                format = "i2s";
                        };
                };
@@ -122,7 +122,7 @@
                dais {
                        dai0 {
                                audio-codec = <&codec_hdmi_spdif>;
-                               i2s-controller = <&spdif>;
+                               audio-controller = <&spdif>;
                        };
                };
        };
@@ -132,7 +132,7 @@
                 dais {
                         dai0 {
                                 audio-codec = <&es8316>;
-                                i2s-controller = <&i2s0>;
+                                audio-controller = <&i2s0>;
                                 format = "i2s";
                         };
                };
@@ -344,6 +344,7 @@
                         sleep_exit_current = <600>;
                         power_off_thresd = <3400>;
                         chrg_diff_voltagemV = <0>;
+                        virtual_power = <0>;
                         support_usb_adp = <1>;
                         support_dc_adp = <1>;
                         dc_det_gpio = <&gpio0 GPIO_C1 GPIO_ACTIVE_LOW>;
@@ -497,7 +498,7 @@
                696000 950000
                816000 975000
                1008000 1050000
-               1200000 1125000
+               1200000 1150000
                1296000 1200000
                >;
        status = "okay";
@@ -510,9 +511,9 @@
                312000 950000
                408000 950000
                600000 950000
-               696000 950000
-               816000 975000
-               1008000 1050000
+               696000 975000
+               816000 1025000
+               1008000 1125000
                >;
        status = "okay";
 };
@@ -521,9 +522,9 @@
        operating-points = <
                /* KHz    uV */
                200000 950000
-               288000 1000000
-               400000 1075000
-               576000 1175000
+               288000 1025000
+               400000 1050000
+               576000 1200000
                >;
 };
 
@@ -532,18 +533,19 @@
                /* KHz    uV */
                96000  950000
                192000 950000
-               300000 975000
-               400000 1000000
-               528000 1050000
-               600000 1075000
-               696000 1100000
-               792000 1125000
+               300000 1025000
+               324000 1025000
+               396000 1050000
+               528000 1100000
+               600000 1125000
+               696000 1150000
+               792000 1175000
                >;
 
        freq-table = <
                /*status                freq(KHz)*/
                SYS_STATUS_NORMAL       528000
-               SYS_STATUS_SUSPEND      96000
+               SYS_STATUS_SUSPEND      192000
                SYS_STATUS_VIDEO_1080P  300000
                SYS_STATUS_VIDEO_4K     600000
                SYS_STATUS_PERFORMANCE  792000
@@ -572,7 +574,7 @@
 &rk818 {
        gpios =<&gpio0 GPIO_A1 GPIO_ACTIVE_HIGH>,<&gpio0 GPIO_A0 GPIO_ACTIVE_LOW>;
        rk818,system-power-controller;
-        pinctrl-names = "dc_det";
+        pinctrl-names = "default";
         pinctrl-0 = <&gpio0_c1>;
        regulators {