Merge back earlier 'pm-cpufreq' material. (6ddee424) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm/mach-davinci/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ config ARCH_DAVINCI_DA850
		bool "DA850/OMAP-L138/AM18x based system"
		select ARCH_DAVINCI_DA8XX
		select ARCH_HAS_CPUFREQ
		select CPU_FREQ_TABLE
		select CP_INTC

		config ARCH_DAVINCI_DA8XX

arch/arm/mach-pxa/Kconfig

+0 −3

Original line number	Diff line number	Diff line
		@@ -615,14 +615,12 @@ endmenu
		config PXA25x
		bool
		select CPU_XSCALE
		select CPU_FREQ_TABLE if CPU_FREQ
		help
		Select code specific to PXA21x/25x/26x variants

		config PXA27x
		bool
		select CPU_XSCALE
		select CPU_FREQ_TABLE if CPU_FREQ
		help
		Select code specific to PXA27x variants

		@@ -635,7 +633,6 @@ config CPU_PXA26x
		config PXA3xx
		bool
		select CPU_XSC3
		select CPU_FREQ_TABLE if CPU_FREQ
		help
		Select code specific to PXA3xx variants

arch/arm/mach-sa1100/generic.c

+21 −44

Original line number	Diff line number	Diff line
		@@ -42,23 +42,24 @@ EXPORT_SYMBOL(reset_status);
		/*
		* This table is setup for a 3.6864MHz Crystal.
		*/
		static const unsigned short cclk_frequency_100khz[NR_FREQS] = {
		590, /* 59.0 MHz */
		737, /* 73.7 MHz */
		885, /* 88.5 MHz */
		1032, /* 103.2 MHz */
		1180, /* 118.0 MHz */
		1327, /* 132.7 MHz */
		1475, /* 147.5 MHz */
		1622, /* 162.2 MHz */
		1769, /* 176.9 MHz */
		1917, /* 191.7 MHz */
		2064, /* 206.4 MHz */
		2212, /* 221.2 MHz */
		2359, /* 235.9 MHz */
		2507, /* 250.7 MHz */
		2654, /* 265.4 MHz */
		2802 /* 280.2 MHz */
		struct cpufreq_frequency_table sa11x0_freq_table[NR_FREQS+1] = {
		{ .frequency = 59000, /* 59.0 MHz */},
		{ .frequency = 73700, /* 73.7 MHz */},
		{ .frequency = 88500, /* 88.5 MHz */},
		{ .frequency = 103200, /* 103.2 MHz */},
		{ .frequency = 118000, /* 118.0 MHz */},
		{ .frequency = 132700, /* 132.7 MHz */},
		{ .frequency = 147500, /* 147.5 MHz */},
		{ .frequency = 162200, /* 162.2 MHz */},
		{ .frequency = 176900, /* 176.9 MHz */},
		{ .frequency = 191700, /* 191.7 MHz */},
		{ .frequency = 206400, /* 206.4 MHz */},
		{ .frequency = 221200, /* 221.2 MHz */},
		{ .frequency = 235900, /* 235.9 MHz */},
		{ .frequency = 250700, /* 250.7 MHz */},
		{ .frequency = 265400, /* 265.4 MHz */},
		{ .frequency = 280200, /* 280.2 MHz */},
		{ .frequency = CPUFREQ_TABLE_END, },
		};

		/* rounds up(!) */
		@@ -66,10 +67,8 @@ unsigned int sa11x0_freq_to_ppcr(unsigned int khz)
		{
		int i;

		khz /= 100;

		for (i = 0; i < NR_FREQS; i++)
		if (cclk_frequency_100khz[i] >= khz)
		if (sa11x0_freq_table[i].frequency >= khz)
		break;

		return i;
		@@ -79,37 +78,15 @@ unsigned int sa11x0_ppcr_to_freq(unsigned int idx)
		{
		unsigned int freq = 0;
		if (idx < NR_FREQS)
		freq = cclk_frequency_100khz[idx] * 100;
		freq = sa11x0_freq_table[idx].frequency;
		return freq;
		}


		/* make sure that only the "userspace" governor is run -- anything else wouldn't make sense on
		* this platform, anyway.
		*/
		int sa11x0_verify_speed(struct cpufreq_policy *policy)
		{
		unsigned int tmp;
		if (policy->cpu)
		return -EINVAL;

		cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);

		/* make sure that at least one frequency is within the policy */
		tmp = cclk_frequency_100khz[sa11x0_freq_to_ppcr(policy->min)] * 100;
		if (tmp > policy->max)
		policy->max = tmp;

		cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);

		return 0;
		}

		unsigned int sa11x0_getspeed(unsigned int cpu)
		{
		if (cpu)
		return 0;
		return cclk_frequency_100khz[PPCR & 0xf] * 100;
		return sa11x0_freq_table[PPCR & 0xf].frequency;
		}

		/*

arch/arm/mach-sa1100/generic.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		*
		* Author: Nicolas Pitre
		*/
		#include <linux/cpufreq.h>
		#include <linux/reboot.h>

		extern void sa1100_timer_init(void);
		@@ -19,10 +20,8 @@ extern void sa11x0_init_late(void);
		extern void sa1110_mb_enable(void);
		extern void sa1110_mb_disable(void);

		struct cpufreq_policy;

		extern struct cpufreq_frequency_table sa11x0_freq_table[];
		extern unsigned int sa11x0_freq_to_ppcr(unsigned int khz);
		extern int sa11x0_verify_speed(struct cpufreq_policy *policy);
		extern unsigned int sa11x0_getspeed(unsigned int cpu);
		extern unsigned int sa11x0_ppcr_to_freq(unsigned int idx);

arch/arm/mach-ux500/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ config UX500_SOC_COMMON

		config UX500_SOC_DB8500
		bool
		select CPU_FREQ_TABLE if CPU_FREQ
		select MFD_DB8500_PRCMU
		select PINCTRL_DB8500
		select PINCTRL_DB8540