1 files changed, 52 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/rk3288-evb-rk808.dts b/arch/arm/boot/dts/rk3288-evb-rk808.dts
index d8c775e6d5fe..d453ddd4b476 100644
--- a/arch/arm/boot/dts/rk3288-evb-rk808.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk808.dts
@@ -31,7 +31,7 @@
                 interrupt-parent = <&gpio0>;
                 interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                 pinctrl-names = "default";
-                pinctrl-0 = <&pmic_int>;
+                pinctrl-0 = <&pmic_int &global_pwroff>;
                 rockchip,system-power-controller;
                 wakeup-source;
                 #clock-cells = <1>;
@@ -50,6 +50,9 @@
                                 regulator-min-microvolt = <750000>;
                                 regulator-max-microvolt = <1350000>;
                                 regulator-name = "vdd_arm";
+                                regulator-state-mem {
+                                        regulator-off-in-suspend;
+                                };
                         };
 
                         vdd_gpu: DCDC_REG2 {
@@ -58,12 +61,19 @@
                                 regulator-min-microvolt = <850000>;
                                 regulator-max-microvolt = <1250000>;
                                 regulator-name = "vdd_gpu";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1000000>;
+                                };
                         };
 
                         vcc_ddr: DCDC_REG3 {
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-name = "vcc_ddr";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
                         };
 
                         vcc_io: DCDC_REG4 {
@@ -72,6 +82,10 @@
                                 regulator-min-microvolt = <3300000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-name = "vcc_io";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <3300000>;
+                                };
                         };
 
                         vccio_pmu: LDO_REG1 {
@@ -80,6 +94,10 @@
                                 regulator-min-microvolt = <3300000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-name = "vccio_pmu";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <3300000>;
+                                };
                         };
 
                         vcc_tp: LDO_REG2 {
@@ -88,6 +106,9 @@
                                 regulator-min-microvolt = <3300000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-name = "vcc_tp";
+                                regulator-state-mem {
+                                        regulator-off-in-suspend;
+                                };
                         };
 
                         vdd_10: LDO_REG3 {
@@ -96,6 +117,10 @@
                                 regulator-min-microvolt = <1000000>;
                                 regulator-max-microvolt = <1000000>;
                                 regulator-name = "vdd_10";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1000000>;
+                                };
                         };
 
                         vcc18_lcd: LDO_REG4 {
@@ -104,6 +129,10 @@
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <1800000>;
                                 regulator-name = "vcc18_lcd";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1800000>;
+                                };
                         };
 
                         vccio_sd: LDO_REG5 {
@@ -112,6 +141,10 @@
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-name = "vccio_sd";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <3300000>;
+                                };
                         };
 
                         vdd10_lcd: LDO_REG6 {
@@ -120,6 +153,10 @@
                                 regulator-min-microvolt = <1000000>;
                                 regulator-max-microvolt = <1000000>;
                                 regulator-name = "vdd10_lcd";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1000000>;
+                                };
                         };
 
                         vcc_18: LDO_REG7 {
@@ -128,6 +165,10 @@
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <1800000>;
                                 regulator-name = "vcc_18";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <1800000>;
+                                };
                         };
 
                         vcca_codec: LDO_REG8 {
@@ -136,18 +177,28 @@
                                 regulator-min-microvolt = <3300000>;
                                 regulator-max-microvolt = <3300000>;
                                 regulator-name = "vcca_codec";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                        regulator-suspend-microvolt = <3300000>;
+                                };
                         };
 
                         vcc_wl: SWITCH_REG1 {
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-name = "vcc_wl";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
                         };
 
                         vcc_lcd: SWITCH_REG2 {
                                 regulator-always-on;
                                 regulator-boot-on;
                                 regulator-name = "vcc_lcd";
+                                regulator-state-mem {
+                                        regulator-on-in-suspend;
+                                };
                         };
                 };
         };