Merge branch 'pm-cpufreq'

[cascardo/linux.git] / arch / arm / boot / dts / am43x-epos-evm.dts

diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index ad32e55..9d35c3f 100644 (file)
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -32,7 +32,7 @@
                enable-active-high;
        };
 
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
                regulator-min-microvolt = <5000000>;
@@ -67,7 +67,7 @@
                };
        };
 
-       matrix_keypad: matrix_keypad@0 {
+       matrix_keypad: matrix_keypad0 {
                compatible = "gpio-matrix-keypad";
                debounce-delay-ms = <5>;
                col-scan-delay-us = <2>;
@@ -421,7 +421,6 @@
                #interrupt-cells = <2>;
 
                dcdc1: regulator-dcdc1 {
-                       compatible = "ti,tps65218-dcdc1";
                        regulator-name = "vdd_core";
                        regulator-min-microvolt = <912000>;
                        regulator-max-microvolt = <1144000>;
@@ -430,7 +429,6 @@
                };
 
                dcdc2: regulator-dcdc2 {
-                       compatible = "ti,tps65218-dcdc2";
                        regulator-name = "vdd_mpu";
                        regulator-min-microvolt = <912000>;
                        regulator-max-microvolt = <1378000>;
@@ -439,7 +437,6 @@
                };
 
                dcdc3: regulator-dcdc3 {
-                       compatible = "ti,tps65218-dcdc3";
                        regulator-name = "vdcdc3";
                        regulator-min-microvolt = <1500000>;
                        regulator-max-microvolt = <1500000>;
@@ -448,7 +445,6 @@
                };
 
                dcdc4: regulator-dcdc4 {
-                       compatible = "ti,tps65218-dcdc4";
                        regulator-name = "vdcdc4";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
@@ -457,21 +453,18 @@
                };
 
                dcdc5: regulator-dcdc5 {
-                       compatible = "ti,tps65218-dcdc5";
                        regulator-name = "v1_0bat";
                        regulator-min-microvolt = <1000000>;
                        regulator-max-microvolt = <1000000>;
                };
 
                dcdc6: regulator-dcdc6 {
-                       compatible = "ti,tps65218-dcdc6";
                        regulator-name = "v1_8bat";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                };
 
                ldo1: regulator-ldo1 {
-                       compatible = "ti,tps65218-ldo1";
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        regulator-boot-on;