ARM: dts: exynos: Correct regulator names

Both CPU-freq and dev-freq drivers support proper regulator lookup from
device-tree, so the early introduced hacks for registering main ARM VDD
regulator under 'vdd_arm' name are no longer needed. Similar for devfreq.
Fix this by removing the obsolete comments and changing the regulator
names to the one, which match the schematics and style for the given
board.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index 0d1e1a9..890525b 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -251,12 +251,7 @@
                        };
 
                        buck1_reg: BUCK1 {
-                               /*
-                               * HACK: The real name is VDD_ARM_1.2V,
-                               * but exynos-cpufreq does not support
-                               * DT-based regulator lookup yet.
-                               */
-                               regulator-name = "vdd_arm";
+                               regulator-name = "VDD_ARM_1.2V";
                                regulator-min-microvolt = <950000>;
                                regulator-max-microvolt = <1350000>;
                                regulator-always-on;

diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index df901f1..c15c6d7 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -408,12 +408,7 @@
                        };
 
                        varm_breg: BUCK1 {
-                            /*
-                             * HACK: The real name is VARM_1.2V_C210,
-                             * but exynos-cpufreq does not support
-                             * DT-based regulator lookup yet.
-                             */
-                            regulator-name = "vdd_arm";
+                            regulator-name = "VARM_1.2V_C210";
                             regulator-min-microvolt = <900000>;
                             regulator-max-microvolt = <1350000>;
                             regulator-always-on;

diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts
index f030217..dd24e64 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts
@@ -318,7 +318,7 @@
                max8952,sync-freq = <0>;
                max8952,ramp-speed = <0>;
 
-               regulator-name = "vdd_arm";
+               regulator-name = "VARM_1.2V_C210";
                regulator-min-microvolt = <770000>;
                regulator-max-microvolt = <1400000>;
                regulator-always-on;

diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi
index 72c9bbb..2c8111c 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-midas.dtsi
+++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
@@ -823,7 +823,7 @@
                        };
 
                        buck1_reg: BUCK1 {
-                               regulator-name = "vdd_mif";
+                               regulator-name = "VDD_MIF";
                                regulator-min-microvolt = <850000>;
                                regulator-max-microvolt = <1100000>;
                                regulator-always-on;
@@ -834,7 +834,7 @@
                        };
 
                        buck2_reg: BUCK2 {
-                               regulator-name = "vdd_arm";
+                               regulator-name = "VDD_ARM";
                                regulator-min-microvolt = <850000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-always-on;
@@ -845,7 +845,7 @@
                        };
 
                        buck3_reg: BUCK3 {
-                               regulator-name = "vdd_int";
+                               regulator-name = "VDD_INT";
                                regulator-min-microvolt = <850000>;
                                regulator-max-microvolt = <1150000>;
                                regulator-always-on;
@@ -856,7 +856,7 @@
                        };
 
                        buck4_reg: BUCK4 {
-                               regulator-name = "vdd_g3d";
+                               regulator-name = "VDD_G3D";
                                regulator-min-microvolt = <850000>;
                                regulator-max-microvolt = <1150000>;
                                regulator-boot-on;

diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 73d6a71..a5c1ce1 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -430,7 +430,7 @@
                        };
 
                        buck1_reg: BUCK1 {
-                               regulator-name = "vdd_mif";
+                               regulator-name = "VDD_MIF";
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <1100000>;
                                regulator-always-on;
@@ -438,7 +438,7 @@
                        };
 
                        buck2_reg: BUCK2 {
-                               regulator-name = "vdd_arm";
+                               regulator-name = "VDD_ARM";
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <1350000>;
                                regulator-always-on;
@@ -446,7 +446,7 @@
                        };
 
                        buck3_reg: BUCK3 {
-                               regulator-name = "vdd_int";
+                               regulator-name = "VDD_INT";
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <1050000>;
                                regulator-always-on;
@@ -454,7 +454,7 @@
                        };
 
                        buck4_reg: BUCK4 {
-                               regulator-name = "vdd_g3d";
+                               regulator-name = "VDD_G3D";
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <1100000>;
                                regulator-microvolt-offset = <50000>;

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index ecd14b2..dc865be 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -363,7 +363,7 @@
                        };
 
                        buck1_reg: BUCK1 {
-                               regulator-name = "vdd_mif";
+                               regulator-name = "VDD_MIF";
                                regulator-min-microvolt = <950000>;
                                regulator-max-microvolt = <1100000>;
                                regulator-always-on;
@@ -372,7 +372,7 @@
                        };
 
                        buck2_reg: BUCK2 {
-                               regulator-name = "vdd_arm";
+                               regulator-name = "VDD_ARM";
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <1350000>;
                                regulator-always-on;
@@ -381,7 +381,7 @@
                        };
 
                        buck3_reg: BUCK3 {
-                               regulator-name = "vdd_int";
+                               regulator-name = "VDD_INT";
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <1200000>;
                                regulator-always-on;
@@ -390,7 +390,7 @@
                        };
 
                        buck4_reg: BUCK4 {
-                               regulator-name = "vdd_g3d";
+                               regulator-name = "VDD_G3D";
                                regulator-min-microvolt = <750000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-always-on;
@@ -399,7 +399,7 @@
                        };
 
                        buck5_reg: BUCK5 {
-                               regulator-name = "vdd_m12";
+                               regulator-name = "VDD_M12";
                                regulator-min-microvolt = <750000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-always-on;
@@ -408,7 +408,7 @@
                        };
 
                        buck6_reg: BUCK6 {
-                               regulator-name = "vdd12_5m";
+                               regulator-name = "VDD12_5M";
                                regulator-min-microvolt = <750000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-always-on;
@@ -417,7 +417,7 @@
                        };
 
                        buck9_reg: BUCK9 {
-                               regulator-name = "vddf28_emmc";
+                               regulator-name = "VDDF28_EMMC";
                                regulator-min-microvolt = <750000>;
                                regulator-max-microvolt = <3000000>;
                                regulator-always-on;

diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index e9f2b9a..c4cc761 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -454,7 +454,7 @@
                        };
 
                        buck1_reg: BUCK1 {
-                               regulator-name = "vdd_mif";
+                               regulator-name = "VDD_MIF";
                                regulator-min-microvolt = <950000>;
                                regulator-max-microvolt = <1200000>;
                                regulator-always-on;
@@ -463,7 +463,7 @@
                        };
 
                        buck2_reg: BUCK2 {
-                               regulator-name = "vdd_arm";
+                               regulator-name = "VDD_ARM";
                                regulator-min-microvolt = <912500>;
                                regulator-max-microvolt = <1300000>;
                                regulator-always-on;
@@ -472,7 +472,7 @@
                        };
 
                        buck3_reg: BUCK3 {
-                               regulator-name = "vdd_int";
+                               regulator-name = "VDD_INT";
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <1200000>;
                                regulator-always-on;
@@ -481,7 +481,7 @@
                        };
 
                        buck4_reg: BUCK4 {
-                               regulator-name = "vdd_g3d";
+                               regulator-name = "VDD_G3D";
                                regulator-min-microvolt = <850000>;
                                regulator-max-microvolt = <1300000>;
                                regulator-always-on;

diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index e9a09dd..dd7f838 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -673,7 +673,7 @@
                        };
 
                        buck2_reg: BUCK2 {
-                               regulator-name = "vdd_arm";
+                               regulator-name = "PVDD_ARM_1V0";
                                regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-always-on;