Commit 02d92950 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: (23 commits)
  [CPUFREQ] EXYNOS: Removed useless headers and codes
  [CPUFREQ] EXYNOS: Make EXYNOS common cpufreq driver
  [CPUFREQ] powernow-k8: Update copyright, maintainer and documentation information
  [CPUFREQ] powernow-k8: Fix indexing issue
  [CPUFREQ] powernow-k8: Avoid Pstate MSR accesses on systems supporting CPB
  [CPUFREQ] update lpj only if frequency has changed
  [CPUFREQ] cpufreq:userspace: fix cpu_cur_freq updation
  [CPUFREQ] Remove wall variable from cpufreq_gov_dbs_init()
  [CPUFREQ] EXYNOS4210: cpufreq code is changed for stable working
  [CPUFREQ] EXYNOS4210: Update frequency table for cpu divider
  [CPUFREQ] EXYNOS4210: Remove code about bus on cpufreq
  [CPUFREQ] s3c64xx: Use pr_fmt() for consistent log messages
  cpufreq: OMAP: fixup for omap_device changes, include <linux/module.h>
  cpufreq: OMAP: fix freq_table leak
  cpufreq: OMAP: put clk if cpu_init failed
  cpufreq: OMAP: only supports OPP library
  cpufreq: OMAP: dont support !freq_table
  cpufreq: OMAP: deny initialization if no mpudev
  cpufreq: OMAP: move clk name decision to init
  cpufreq: OMAP: notify even with bad boot frequency
  ...
parents b24ca57e 6c523c61

arch/arm/mach-exynos/include/mach/cpufreq.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-exynos/include/mach/cpufreq.h

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * EXYNOS - CPUFreq support

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



enum cpufreq_level_index {

	L0, L1, L2, L3, L4,

	L5, L6, L7, L8, L9,

	L10, L11, L12, L13, L14,

	L15, L16, L17, L18, L19,

	L20,

};



struct exynos_dvfs_info {

	unsigned long	mpll_freq_khz;

	unsigned int	pll_safe_idx;

	unsigned int	pm_lock_idx;

	unsigned int	max_support_idx;

	unsigned int	min_support_idx;

	struct clk	*cpu_clk;

	unsigned int	*volt_table;

	struct cpufreq_frequency_table	*freq_table;

	void (*set_freq)(unsigned int, unsigned int);

	bool (*need_apll_change)(unsigned int, unsigned int);

};



extern int exynos4210_cpufreq_init(struct exynos_dvfs_info *);

drivers/cpufreq/Kconfig.arm

+11 −4
Original line number Diff line number Diff line
@@ -21,12 +21,19 @@ config ARM_S5PV210_CPUFREQ 


	  If in doubt, say N.



config ARM_EXYNOS_CPUFREQ

	bool "SAMSUNG EXYNOS SoCs"

	depends on ARCH_EXYNOS

	select ARM_EXYNOS4210_CPUFREQ if CPU_EXYNOS4210

	default y

	help

	  This adds the CPUFreq driver common part for Samsung

	  EXYNOS SoCs.



	  If in doubt, say N.



config ARM_EXYNOS4210_CPUFREQ

	bool "Samsung EXYNOS4210"

	depends on CPU_EXYNOS4210

	default y

	help

	  This adds the CPUFreq driver for Samsung EXYNOS4210

	  SoC (S5PV310 or S5PC210).
 


	  If in doubt, say N.

drivers/cpufreq/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -42,7 +42,9 @@ obj-$(CONFIG_X86_CPUFREQ_NFORCE2) += cpufreq-nforce2.o 
obj-$(CONFIG_UX500_SOC_DB8500)		+= db8500-cpufreq.o

obj-$(CONFIG_ARM_S3C64XX_CPUFREQ)	+= s3c64xx-cpufreq.o

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_ARCH_OMAP2PLUS)            += omap-cpufreq.o



##################################################################################

# PowerPC platform drivers

drivers/cpufreq/cpufreq.c

+1 −2
Original line number Diff line number Diff line
@@ -204,8 +204,7 @@ static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci) 
		pr_debug("saving %lu as reference value for loops_per_jiffy; "

			"freq is %u kHz\n", l_p_j_ref, l_p_j_ref_freq);

	}

	if ((val == CPUFREQ_PRECHANGE  && ci->old < ci->new) ||

	    (val == CPUFREQ_POSTCHANGE && ci->old > ci->new) ||

	if ((val == CPUFREQ_POSTCHANGE  && ci->old != ci->new) ||

	    (val == CPUFREQ_RESUMECHANGE || val == CPUFREQ_SUSPENDCHANGE)) {

		loops_per_jiffy = cpufreq_scale(l_p_j_ref, l_p_j_ref_freq,

								ci->new);

drivers/cpufreq/cpufreq_ondemand.c

+1 −2
Original line number Diff line number Diff line
@@ -713,11 +713,10 @@ static int cpufreq_governor_dbs(struct cpufreq_policy *policy, 


static int __init cpufreq_gov_dbs_init(void)

{

	cputime64_t wall;

	u64 idle_time;

	int cpu = get_cpu();



	idle_time = get_cpu_idle_time_us(cpu, &wall);

	idle_time = get_cpu_idle_time_us(cpu, NULL);

	put_cpu();

	if (idle_time != -1ULL) {

		/* Idle micro accounting is supported. Use finer thresholds */

CRA Git | Maintained and supported by SUSTech CRA and CCSE