Skip to content

Commit

Permalink
Merge tag 'samsung-late-cpufreq-driver' of git://git.kernel.org/pub/s…
Browse files Browse the repository at this point in the history
…cm/linux/kernel/git/kgene/linux-samsung into next/late

Samsung cpufreq driver updates for v4.3

- remove exynos4 SoCs and exynos5250 specific cpufreq driver support
  and unselectable rule for arm-exynos-cpufreq.o because of supporting
  generic cpufreq driver for the exynos SoCs

* Note this is depending on tags/samsung-clk-driver, tags/samsung-soc
  and tags/samsung-late-dt

* tag 'samsung-late-cpufreq-driver' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  cpufreq: exynos: Remove unselectable rule for arm-exynos-cpufreq.o
  cpufreq: exynos: remove Exynos4x12 specific cpufreq driver support
  cpufreq: exynos: remove exynos5250 specific cpufreq driver support

Signed-off-by: Olof Johansson <olof@lixom.net>
  • Loading branch information
Olof Johansson committed Aug 21, 2015
2 parents 418012f + 5e3863a commit deb1436
Showing 6 changed files with 0 additions and 825 deletions.
49 changes: 0 additions & 49 deletions drivers/cpufreq/Kconfig.arm
Original file line number Diff line number Diff line change
@@ -24,55 +24,6 @@ config ARM_VEXPRESS_SPC_CPUFREQ
This add the CPUfreq driver support for Versatile Express
big.LITTLE platforms using SPC for power management.


config ARM_EXYNOS_CPUFREQ
tristate "SAMSUNG EXYNOS CPUfreq Driver"
depends on CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412 || SOC_EXYNOS5250
depends on THERMAL
help
This adds the CPUFreq driver for Samsung EXYNOS platforms.
Supported SoC versions are:
Exynos4210, Exynos4212, Exynos4412, and Exynos5250.

If in doubt, say N.

config ARM_EXYNOS4X12_CPUFREQ
bool "SAMSUNG EXYNOS4x12"
depends on SOC_EXYNOS4212 || SOC_EXYNOS4412
depends on ARM_EXYNOS_CPUFREQ
default y
help
This adds the CPUFreq driver for Samsung EXYNOS4X12
SoC (EXYNOS4212 or EXYNOS4412).

If in doubt, say N.

config ARM_EXYNOS5250_CPUFREQ
bool "SAMSUNG EXYNOS5250"
depends on SOC_EXYNOS5250
depends on ARM_EXYNOS_CPUFREQ
default y
help
This adds the CPUFreq driver for Samsung EXYNOS5250
SoC.

If in doubt, say N.

config ARM_EXYNOS_CPU_FREQ_BOOST_SW
bool "EXYNOS Frequency Overclocking - Software"
depends on ARM_EXYNOS_CPUFREQ && THERMAL
select CPU_FREQ_BOOST_SW
select EXYNOS_THERMAL
help
This driver supports software managed overclocking (BOOST).
It allows usage of special frequencies for Samsung Exynos
processors if thermal conditions are appropriate.

It requires, for safe operation, thermal framework with properly
defined trip points.

If in doubt, say N.

config ARM_EXYNOS5440_CPUFREQ
tristate "SAMSUNG EXYNOS5440"
depends on SOC_EXYNOS5440
4 changes: 0 additions & 4 deletions drivers/cpufreq/Makefile
Original file line number Diff line number Diff line change
@@ -52,10 +52,6 @@ obj-$(CONFIG_ARM_DT_BL_CPUFREQ) += arm_big_little_dt.o

obj-$(CONFIG_ARCH_DAVINCI) += davinci-cpufreq.o
obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += arm-exynos-cpufreq.o
arm-exynos-cpufreq-y := exynos-cpufreq.o
arm-exynos-cpufreq-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o
arm-exynos-cpufreq-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS5440_CPUFREQ) += exynos5440-cpufreq.o
obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o
obj-$(CONFIG_ARM_HISI_ACPU_CPUFREQ) += hisi-acpu-cpufreq.o
237 changes: 0 additions & 237 deletions drivers/cpufreq/exynos-cpufreq.c

This file was deleted.

89 changes: 0 additions & 89 deletions drivers/cpufreq/exynos-cpufreq.h

This file was deleted.

236 changes: 0 additions & 236 deletions drivers/cpufreq/exynos4x12-cpufreq.c

This file was deleted.

210 changes: 0 additions & 210 deletions drivers/cpufreq/exynos5250-cpufreq.c

This file was deleted.

0 comments on commit deb1436

Please sign in to comment.