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

Commit e28f160b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: msm: Remove MSM_CPU_FREQ_SET_MIN_MAX related config"

parents 2e58772e e13133c8

arch/arm/mach-msm/Kconfig

+0 −21
Original line number Diff line number Diff line
@@ -650,27 +650,6 @@ config MSM_RPC_LOOPBACK_XPRT 
	  Support for routing RPC messages between APPS clients

	  and APPS servers.  Helps in testing APPS RPC framework.



if CPU_FREQ_MSM



config MSM_CPU_FREQ_SET_MIN_MAX

	bool "Set Min/Max CPU frequencies."

	default n

	help

	  Allow setting min and max CPU frequencies. Sysfs can be used

	  to override these values.



config MSM_CPU_FREQ_MAX

	int "Max CPU Frequency"

	depends on MSM_CPU_FREQ_SET_MIN_MAX

	default 384000



config MSM_CPU_FREQ_MIN

	int "Min CPU Frequency"

	depends on MSM_CPU_FREQ_SET_MIN_MAX

	default 245760



endif # CPU_FREQ_MSM



config RTAC

	bool "MSM8K real-time audio calibration support"

	default y

drivers/cpufreq/qcom-cpufreq.c

+2 −10
Original line number Diff line number Diff line
@@ -200,16 +200,8 @@ static int msm_cpufreq_init(struct cpufreq_policy *policy) 
		}

	}



	if (cpufreq_frequency_table_cpuinfo(policy, table)) {

#ifdef CONFIG_MSM_CPU_FREQ_SET_MIN_MAX

		policy->cpuinfo.min_freq = CONFIG_MSM_CPU_FREQ_MIN;

		policy->cpuinfo.max_freq = CONFIG_MSM_CPU_FREQ_MAX;

#endif

	}

#ifdef CONFIG_MSM_CPU_FREQ_SET_MIN_MAX

	policy->min = CONFIG_MSM_CPU_FREQ_MIN;

	policy->max = CONFIG_MSM_CPU_FREQ_MAX;

#endif

	if (cpufreq_frequency_table_cpuinfo(policy, table))

		pr_err("cpufreq: failed to get policy min/max\n");



	cur_freq = clk_get_rate(cpu_clk[policy->cpu])/1000;