From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Mar 2012 00:56:39 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cf821923ba9aa0917165a12573bdd6dc0a354421;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'next' of git://git./linux/kernel/git/davej/cpufreq

Pull cpufreq updates for 3.4 from Dave Jones: new drivers and some fixes.

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  provide disable_cpufreq() function to disable the API.
  EXYNOS5250: Add support cpufreq for EXYNOS5250
  EXYNOS4X12: Add support cpufreq for EXYNOS4X12
  [CPUFREQ] CPUfreq ondemand: update sampling rate without waiting for next sampling
  [CPUFREQ] Add S3C2416/S3C2450 cpufreq driver
  [CPUFREQ] Fix exposure of ARM_EXYNOS4210_CPUFREQ
  [CPUFREQ] EXYNOS4210: update the name of EXYNOS clock register
  [CPUFREQ] EXYNOS: Initialize locking_frequency with initial frequency
  [CPUFREQ] s3c64xx: Fix mis-cherry pick of VDDINT

Fix up trivial conflicts in Kconfig and Makefile due to just changes
next to each other (OMAP2PLUS changes vs some new EXYNOS cpufreq
drivers).
---

cf821923ba9aa0917165a12573bdd6dc0a354421
diff --cc drivers/cpufreq/Kconfig.arm
index 82f1aa9c3b6f,2e3351526ffa..32d790dd8180
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@@ -2,11 -2,28 +2,33 @@@
  # ARM CPU Frequency scaling drivers
  #
  
 +config ARM_OMAP2PLUS_CPUFREQ
 +	bool "TI OMAP2+"
 +	default ARCH_OMAP2PLUS
 +	select CPU_FREQ_TABLE
 +
+ config ARM_S3C2416_CPUFREQ
+ 	bool "S3C2416 CPU Frequency scaling support"
+ 	depends on CPU_S3C2416
+ 	help
+ 	  This adds the CPUFreq driver for the Samsung S3C2416 and
+ 	  S3C2450 SoC. The S3C2416 supports changing the rate of the
+ 	  armdiv clock source and also entering a so called dynamic
+ 	  voltage scaling mode in which it is possible to reduce the
+ 	  core voltage of the cpu.
+ 
+ 	  If in doubt, say N.
+ 
+ config ARM_S3C2416_CPUFREQ_VCORESCALE
+ 	bool "Allow voltage scaling for S3C2416 arm core (EXPERIMENTAL)"
+ 	depends on ARM_S3C2416_CPUFREQ && REGULATOR && EXPERIMENTAL
+ 	help
+ 	  Enable CPU voltage scaling when entering the dvs mode.
+ 	  It uses information gathered through existing hardware and
+ 	  tests but not documented in any datasheet.
+ 
+ 	  If in doubt, say N.
+ 
  config ARM_S3C64XX_CPUFREQ
  	bool "Samsung S3C64XX"
  	depends on CPU_S3C6410
diff --cc drivers/cpufreq/Makefile
index fda94c74eab0,3cbbcd09c650..9531fc2eda22
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@@ -44,7 -45,9 +45,9 @@@ obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)	+= s3
  obj-$(CONFIG_ARM_S5PV210_CPUFREQ)	+= s5pv210-cpufreq.o
  obj-$(CONFIG_ARM_EXYNOS_CPUFREQ)	+= exynos-cpufreq.o
  obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ)	+= exynos4210-cpufreq.o
+ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ)	+= exynos4x12-cpufreq.o
+ obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ)	+= exynos5250-cpufreq.o
 -obj-$(CONFIG_ARCH_OMAP2PLUS)            += omap-cpufreq.o
 +obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ)     += omap-cpufreq.o
  
  ##################################################################################
  # PowerPC platform drivers