Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq (8405b044) · Commits · 戴 / test

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] s5pv210: make needlessly global symbols static [CPUFREQ] exynos4210: make needlessly global symbols static [CPUFREQ] S3C6410: Add some lower frequencies for 800MHz base clock operation [CPUFREQ] S5PV210: Add reboot notifier to prevent system hang [CPUFREQ] S5PV210: Adjust udelay prior to voltage scaling down [CPUFREQ] S5PV210: Lock a mutex while changing the cpu frequency [CPUFREQ] S5PV210: Add pm_notifier to prevent system unstable [CPUFREQ] S5PV210: Add arm/int voltage control support [CPUFREQ] S5PV210: Add additional symantics for "relation" in cpufreq with pm [CPUFREQ] S3C64xx: Notify transition complete as soon as frequency changed [CPUFREQ] S3C6410: Support 800MHz operation in cpufreq [CPUFREQ] s5pv210-cpufreq.c: Add missing clk_put [CPUFREQ] Move compile for S3C64XX cpufreq to /drivers/cpufreq [CPUFREQ] Remove some vi noise that escaped into the Makefile. [CPUFREQ] Move ARM Samsung cpufreq drivers to drivers/cpufreq/ [CPUFREQ/S3C64xx] Move S3C64xx CPUfreq driver into drivers/cpufreq [CPUFREQ] Handle CPUs with different capabilities in acpi-cpufreq

arch/arm/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -1895,10 +1895,6 @@ config CPU_FREQ_PXA
		default y
		select CPU_FREQ_DEFAULT_GOV_USERSPACE

		config CPU_FREQ_S3C64XX
		bool "CPUfreq support for Samsung S3C64XX CPUs"
		depends on CPU_FREQ && CPU_S3C6410

		config CPU_FREQ_S3C
		bool
		help

arch/arm/mach-exynos4/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@ obj- :=
		obj-$(CONFIG_CPU_EXYNOS4210) += cpu.o init.o clock.o irq-combiner.o
		obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o irq-eint.o dma.o
		obj-$(CONFIG_PM) += pm.o sleep.o
		obj-$(CONFIG_CPU_FREQ) += cpufreq.o
		obj-$(CONFIG_CPU_IDLE) += cpuidle.o

		obj-$(CONFIG_SMP) += platsmp.o headsmp.o

arch/arm/mach-s3c64xx/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -23,10 +23,6 @@ obj-$(CONFIG_CPU_S3C6410) += s3c6410.o
		obj-y += irq.o
		obj-y += irq-eint.o

		# CPU frequency scaling

		obj-$(CONFIG_CPU_FREQ_S3C64XX) += cpufreq.o

		# DMA support

		obj-$(CONFIG_S3C64XX_DMA) += dma.o

arch/arm/mach-s5pv210/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@ obj- :=
		obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o dma.o
		obj-$(CONFIG_CPU_S5PV210) += setup-i2c0.o
		obj-$(CONFIG_S5PV210_PM) += pm.o sleep.o
		obj-$(CONFIG_CPU_FREQ) += cpufreq.o

		# machine support

drivers/cpufreq/Kconfig

+5 −0

Original line number	Diff line number	Diff line
		@@ -184,5 +184,10 @@ depends on X86
		source "drivers/cpufreq/Kconfig.x86"
		endmenu

		menu "ARM CPU frequency scaling drivers"
		depends on ARM
		source "drivers/cpufreq/Kconfig.arm"
		endmenu

		endif
		endmenu

Admin message