|
@@ -48,6 +48,7 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
|
|
|
struct cpufreq_policy *policy = cpufreq_cpu_get(0);
|
|
|
unsigned int arm_volt, safe_arm_volt = 0;
|
|
|
unsigned int mpll_freq_khz = exynos_info->mpll_freq_khz;
|
|
|
+ struct device *dev = exynos_info->dev;
|
|
|
unsigned int old_freq;
|
|
|
int index, old_index;
|
|
|
int ret = 0;
|
|
@@ -89,8 +90,8 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
|
|
|
/* Firstly, voltage up to increase frequency */
|
|
|
ret = regulator_set_voltage(arm_regulator, arm_volt, arm_volt);
|
|
|
if (ret) {
|
|
|
- pr_err("%s: failed to set cpu voltage to %d\n",
|
|
|
- __func__, arm_volt);
|
|
|
+ dev_err(dev, "failed to set cpu voltage to %d\n",
|
|
|
+ arm_volt);
|
|
|
return ret;
|
|
|
}
|
|
|
}
|
|
@@ -99,8 +100,8 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
|
|
|
ret = regulator_set_voltage(arm_regulator, safe_arm_volt,
|
|
|
safe_arm_volt);
|
|
|
if (ret) {
|
|
|
- pr_err("%s: failed to set cpu voltage to %d\n",
|
|
|
- __func__, safe_arm_volt);
|
|
|
+ dev_err(dev, "failed to set cpu voltage to %d\n",
|
|
|
+ safe_arm_volt);
|
|
|
return ret;
|
|
|
}
|
|
|
}
|
|
@@ -114,8 +115,8 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
|
|
|
ret = regulator_set_voltage(arm_regulator, arm_volt,
|
|
|
arm_volt);
|
|
|
if (ret) {
|
|
|
- pr_err("%s: failed to set cpu voltage to %d\n",
|
|
|
- __func__, arm_volt);
|
|
|
+ dev_err(dev, "failed to set cpu voltage to %d\n",
|
|
|
+ arm_volt);
|
|
|
goto out;
|
|
|
}
|
|
|
}
|
|
@@ -162,6 +163,8 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
|
|
|
if (!exynos_info)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
+ exynos_info->dev = &pdev->dev;
|
|
|
+
|
|
|
if (soc_is_exynos4210())
|
|
|
ret = exynos4210_cpufreq_init(exynos_info);
|
|
|
else if (soc_is_exynos4212() || soc_is_exynos4412())
|
|
@@ -175,13 +178,13 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
|
|
|
goto err_vdd_arm;
|
|
|
|
|
|
if (exynos_info->set_freq == NULL) {
|
|
|
- pr_err("%s: No set_freq function (ERR)\n", __func__);
|
|
|
+ dev_err(&pdev->dev, "No set_freq function (ERR)\n");
|
|
|
goto err_vdd_arm;
|
|
|
}
|
|
|
|
|
|
arm_regulator = regulator_get(NULL, "vdd_arm");
|
|
|
if (IS_ERR(arm_regulator)) {
|
|
|
- pr_err("%s: failed to get resource vdd_arm\n", __func__);
|
|
|
+ dev_err(&pdev->dev, "failed to get resource vdd_arm\n");
|
|
|
goto err_vdd_arm;
|
|
|
}
|
|
|
|
|
@@ -191,7 +194,7 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
|
|
|
if (!cpufreq_register_driver(&exynos_driver))
|
|
|
return 0;
|
|
|
|
|
|
- pr_err("%s: failed to register cpufreq driver\n", __func__);
|
|
|
+ dev_err(&pdev->dev, "failed to register cpufreq driver\n");
|
|
|
regulator_put(arm_regulator);
|
|
|
err_vdd_arm:
|
|
|
kfree(exynos_info);
|