From: cl <cl@rock-chips.com>
Date: Thu, 16 Oct 2014 03:13:05 +0000 (+0800)
Subject: cpufreq: set suspend volt to 1.1V for 40nm process, fix reboot err when vdd_arm regul... 
X-Git-Tag: firefly_0821_release~4578
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ffb44e63b3972fb02a80818da34d443b14fcbdca;p=firefly-linux-kernel-4.4.55.git

cpufreq: set suspend volt to 1.1V for 40nm process, fix reboot err when vdd_arm regulator is not registered

Signed-off-by: cl <cl@rock-chips.com>
---

diff --git a/drivers/cpufreq/rockchip-cpufreq.c b/drivers/cpufreq/rockchip-cpufreq.c
index 559d92c273bd..3b03329174e7 100644
--- a/drivers/cpufreq/rockchip-cpufreq.c
+++ b/drivers/cpufreq/rockchip-cpufreq.c
@@ -69,7 +69,7 @@ static struct cpufreq_frequency_table *freq_table = default_freq_table;
 #define CPUFREQ_PRIVATE                 0x100
 static unsigned int no_cpufreq_access = 0;
 static unsigned int suspend_freq = 816 * 1000;
-static unsigned int suspend_volt = 1000000; // 1V
+static unsigned int suspend_volt = 1100000;
 static unsigned int low_battery_freq = 600 * 1000;
 static unsigned int low_battery_capacity = 5; // 5%
 static bool is_booting = true;
@@ -414,10 +414,21 @@ static int cpufreq_reboot_notifier_event(struct notifier_block *this, unsigned l
 #endif
 int rockchip_cpufreq_reboot_limit_freq(void)
 {
+	struct regulator *regulator;
+	int volt = 0;
+	u32 rate;
+
 	dvfs_disable_temp_limit();
 	dvfs_clk_enable_limit(clk_cpu_dvfs_node, 1000*suspend_freq, 1000*suspend_freq);
-	printk("cpufreq: reboot set core rate=%lu, volt=%d\n", dvfs_clk_get_rate(clk_cpu_dvfs_node), 
-		regulator_get_voltage(clk_cpu_dvfs_node->vd->regulator));
+
+	rate = dvfs_clk_get_rate(clk_cpu_dvfs_node);
+	regulator = dvfs_get_regulator("vdd_arm");
+	if (regulator)
+		volt = regulator_get_voltage(regulator);
+	else
+		pr_info("cpufreq: get arm regulator failed\n");
+	pr_info("cpufreq: reboot set core rate=%lu, volt=%d\n",
+		dvfs_clk_get_rate(clk_cpu_dvfs_node), volt);
 
 	return 0;
 }