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
index f3032d5574035fd4b3716efa0a26c8f455bdf027..773816c3ba9d041dee54d8d4229a3e0e6eb2c589 100755 (executable)
--- 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>;
@@ -573,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 {