Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d5709a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq 

* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Don't take semaphore in cpufreq_quick_get()
  [CPUFREQ] Support different families in fid/did to frequency conversion
  [CPUFREQ] cpufreq_stats: misc cpuinit section annotations
  [CPUFREQ] implement !CONFIG_CPU_FREQ stub for  cpufreq_unregister_notifier()
  [CPUFREQ] mark hotplug notifier callback as __cpuinit
  [CPUFREQ] Only check for transition latency on problematic governors (kconfig fix)
  [CPUFREQ] allow ondemand and conservative cpufreq governors to be used as default
  [CPUFREQ] move policy's governor initialisation out of low-level drivers into cpufreq core
  [CPUFREQ] Longhaul - Add support for PM133 northbridge
  [CPUFREQ] x86: use num_online_nodes to get physical cpus numbers for
parents 57c5b999 9eb59573

arch/arm/mach-imx/cpufreq.c

+0 −1
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ static int __init imx_cpufreq_driver_init(struct cpufreq_policy *policy) 
		return -EINVAL;



	policy->cur = policy->min = policy->max = imx_get_speed(0);

	policy->governor = CPUFREQ_DEFAULT_GOVERNOR;

	policy->cpuinfo.min_freq = 8000;

	policy->cpuinfo.max_freq = 200000;

	 /* Manual states, that PLL stabilizes in two CLK32 periods */

arch/arm/mach-sa1100/cpu-sa1110.c

+0 −1
Original line number Diff line number Diff line
@@ -331,7 +331,6 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy) 
	if (policy->cpu != 0)

		return -EINVAL;

	policy->cur = policy->min = policy->max = sa11x0_getspeed(0);

	policy->governor = CPUFREQ_DEFAULT_GOVERNOR;

	policy->cpuinfo.min_freq = 59000;

	policy->cpuinfo.max_freq = 287000;

	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

arch/arm/plat-omap/cpu-omap.c

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ static int __init omap_cpu_init(struct cpufreq_policy *policy) 
	if (policy->cpu != 0)

		return -EINVAL;

	policy->cur = policy->min = policy->max = omap_getspeed(0);

	policy->governor = CPUFREQ_DEFAULT_GOVERNOR;

	policy->cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000;

	policy->cpuinfo.max_freq = clk_round_rate(mpu_clk, VERY_HI_RATE) / 1000;

	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

arch/blackfin/mach-bf533/cpu.c

+0 −2
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ static int __init __bf533_cpu_init(struct cpufreq_policy *policy) 
	if (policy->cpu != 0)

		return -EINVAL;



	policy->governor = CPUFREQ_DEFAULT_GOVERNOR;



	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

	/*Now ,only support one cpu */

	policy->cur = bf533_getfreq(0);

arch/ia64/kernel/cpufreq/acpi-cpufreq.c

+0 −2
Original line number Diff line number Diff line
@@ -321,8 +321,6 @@ acpi_cpufreq_cpu_init ( 
			    data->acpi_data.states[i].transition_latency * 1000;

		}

	}

	policy->governor = CPUFREQ_DEFAULT_GOVERNOR;



	policy->cur = processor_get_freq(data, policy->cpu);



	/* table init */