linux-next: manual merge of the cpufreq tree with the cpufreq-current tree

linux-next: manual merge of the cpufreq tree with the cpufreq-current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1219 bytes --]

Hi Dave,

Today's linux-next merge of the cpufreq tree got a conflict in
drivers/cpufreq/Makefile between commit b09db45c56c2 ("cpufreq: OMAP
driver depends CPUfreq tables") from the cpufreq-current tree and commit
a35c50510dd4 ("EXYNOS4X12: Add support cpufreq for EXYNOS4X12") from the
cpufreq tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/cpufreq/Makefile
index fda94c7,3cbbcd0..0000000
--- 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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the cpufreq tree with the cpufreq-current tree

[Dave Jones]

On Thu, Mar 15, 2012 at 01:23:52PM +1100, Stephen Rothwell wrote:
 > Hi Dave,
 > 
 > Today's linux-next merge of the cpufreq tree got a conflict in
 > drivers/cpufreq/Makefile between commit b09db45c56c2 ("cpufreq: OMAP
 > driver depends CPUfreq tables") from the cpufreq-current tree and commit
 > a35c50510dd4 ("EXYNOS4X12: Add support cpufreq for EXYNOS4X12") from the
 > cpufreq tree.
 > 
 > Just context changes.  I fixed it up (see below) and can carry the fix as
 > necessary.

Argh, I've managed to get "for 3.4" patches on my fixes branch by mistake.
Given how close we are to 3.3 now, I'll just have Linus pull both branches
when 3.4 opens up.

thanks for catching this.

	Dave

linux-next: manual merge of the cpufreq tree with the cpufreq-current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1712 bytes --]

Hi Dave,

Today's linux-next merge of the cpufreq tree got a conflict in
drivers/cpufreq/Kconfig.arm between commit b09db45c56c2 ("cpufreq: OMAP
driver depends CPUfreq tables") from the cpufreq-current tree and commit
34ee55075265 ("[CPUFREQ] Add S3C2416/S3C2450 cpufreq driver") from the
cpufreq tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/cpufreq/Kconfig.arm
index 82f1aa9,dc59abf..0000000
--- 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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]