From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2014 01:14:35 +0000 (+1000)
Subject: Merge remote-tracking branch 'pm/linux-next'
X-Git-Tag: next-20140530~79
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dabf25875906018f3a16000b58444d41ceb544bb;p=karo-tx-linux.git

Merge remote-tracking branch 'pm/linux-next'

Conflicts:
	drivers/cpufreq/exynos-cpufreq.c
	drivers/cpufreq/exynos-cpufreq.h
---

dabf25875906018f3a16000b58444d41ceb544bb
diff --cc drivers/cpufreq/exynos-cpufreq.c
index 348c8bafe436,c3e55aa28cf8..1e0ec57bf6e3
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@@ -162,22 -163,16 +162,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 (of_machine_is_compatible("samsung,exynos4412")) {
 +		exynos_info->type = EXYNOS_SOC_4412;
  		ret = exynos4x12_cpufreq_init(exynos_info);
 -	else if (soc_is_exynos5250())
 +	} 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 51af42e1b7fe,b72ff10a040e..8dfebaca1e6d
--- 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;
diff --cc drivers/cpuidle/Makefile
index 5404d5d1e66a,534fff575823..d8bb1ff72561
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@@ -7,8 -7,8 +7,9 @@@ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLE
  
  ##################################################################################
  # ARM SoC drivers
 +obj-$(CONFIG_ARM_ARMADA_370_XP_CPUIDLE) += cpuidle-armada-370-xp.o
  obj-$(CONFIG_ARM_BIG_LITTLE_CPUIDLE)	+= cpuidle-big_little.o
+ obj-$(CONFIG_ARM_CLPS711X_CPUIDLE)	+= cpuidle-clps711x.o
  obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)	+= cpuidle-calxeda.o
  obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)	+= cpuidle-kirkwood.o
  obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)		+= cpuidle-zynq.o