Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...

[cascardo/linux.git] / arch / arm / boot / dts / am437x-gp-evm.dts

diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
index 14677d5..957840c 100644 (file)
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -58,7 +58,7 @@
                default-brightness-level = <8>;
        };
 
-       matrix_keypad: matrix_keypad@0 {
+       matrix_keypad: matrix_keypad0 {
                compatible = "gpio-matrix-keypad";
                debounce-delay-ms = <5>;
                col-scan-delay-us = <2>;
@@ -513,7 +513,6 @@
                #interrupt-cells = <2>;
 
                dcdc1: regulator-dcdc1 {
-                       compatible = "ti,tps65218-dcdc1";
                        regulator-name = "vdd_core";
                        regulator-min-microvolt = <912000>;
                        regulator-max-microvolt = <1144000>;
@@ -522,7 +521,6 @@
                };
 
                dcdc2: regulator-dcdc2 {
-                       compatible = "ti,tps65218-dcdc2";
                        regulator-name = "vdd_mpu";
                        regulator-min-microvolt = <912000>;
                        regulator-max-microvolt = <1378000>;
@@ -531,33 +529,42 @@
                };
 
                dcdc3: regulator-dcdc3 {
-                       compatible = "ti,tps65218-dcdc3";
                        regulator-name = "vdcdc3";
                        regulator-min-microvolt = <1500000>;
                        regulator-max-microvolt = <1500000>;
                        regulator-boot-on;
                        regulator-always-on;
+                       regulator-state-mem {
+                               regulator-on-in-suspend;
+                       };
+                       regulator-state-disk {
+                               regulator-off-in-suspend;
+                       };
                };
+
                dcdc5: regulator-dcdc5 {
-                       compatible = "ti,tps65218-dcdc5";
                        regulator-name = "v1_0bat";
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1000000>;
                        regulator-boot-on;
                        regulator-always-on;
+                       regulator-state-mem {
+                               regulator-on-in-suspend;
+                       };
                };
 
                dcdc6: regulator-dcdc6 {
-                       compatible = "ti,tps65218-dcdc6";
                        regulator-name = "v1_8bat";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        regulator-boot-on;
                        regulator-always-on;
+                       regulator-state-mem {
+                               regulator-on-in-suspend;
+                       };
                };
 
                ldo1: regulator-ldo1 {
-                       compatible = "ti,tps65218-ldo1";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        regulator-boot-on;