Subject: linux-next: manual merge of the pm tree with the samsung tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 19 May 2014 12:51:24 +1000

Hi Rafael,

Today's linux-next merge of the pm tree got conflicts in
drivers/cpufreq/exynos-cpufreq.c and drivers/cpufreq/exynos-cpufreq.h
between commit 2b07f4085479 ("cpufreq: exynos: Fix the compile error")
from the samsung tree and commit e5eaa445b0dc ("cpufreq: exynos: Use
dev_err/info function instead of pr_err/info") from the pm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/cpufreq/exynos-cpufreq.c
index e8a4a7ed38c1,c3e55aa28cf8..000000000000
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@@ -164,22 -163,16 +164,24 @@@ static int exynos_cpufreq_probe(struct 
  	if (!exynos_info)
  		return -ENOMEM;
  
+ 	exynos_info->dev = &pdev->dev;
+ 
 -	if (soc_is_exynos4210())
 +	if (of_machine_is_compatible("samsung,exynos4210")) {
 +		exynos_info->type = EXYNOS_SOC_4210;
  		ret = exynos4210_cpufreq_init(exynos_info);
 -	else if (soc_is_exynos4212() || soc_is_exynos4412())
 +	} else if (of_machine_is_compatible("samsung,exynos4212")) {
 +		exynos_info->type = EXYNOS_SOC_4212;
  		ret = exynos4x12_cpufreq_init(exynos_info);
 -	else if (soc_is_exynos5250())
 +	} else if (of_machine_is_compatible("samsung,exynos4412")) {
 +		exynos_info->type = EXYNOS_SOC_4412;
 +		ret = exynos4x12_cpufreq_init(exynos_info);
 +	} else if (of_machine_is_compatible("samsung,exynos5250")) {
 +		exynos_info->type = EXYNOS_SOC_5250;
  		ret = exynos5250_cpufreq_init(exynos_info);
 -	else
 -		return 0;
 +	} else {
 +		pr_err("%s: Unknown SoC type\n", __func__);
 +		return -ENODEV;
 +	}
  
  	if (ret)
  		goto err_vdd_arm;
diff --cc drivers/cpufreq/exynos-cpufreq.h
index f189547bb447,b72ff10a040e..000000000000
--- a/drivers/cpufreq/exynos-cpufreq.h
+++ b/drivers/cpufreq/exynos-cpufreq.h
@@@ -41,7 -34,7 +41,8 @@@ struct apll_freq 
  };
  
  struct exynos_dvfs_info {
+ 	struct device	*dev;
 +	enum exynos_soc_type type;
  	unsigned long	mpll_freq_khz;
  	unsigned int	pll_safe_idx;
  	struct clk	*cpu_clk;