hafm/hafm-tb: make interface to choose on among P-state boost solutions.

Change-Id: I3ac5dacf298892e3e75f60263124ff403c13706b

diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index efe920aa0df9a6dc404bf7a32bd5488767551da6..ad9b6034b75af7864a94ea8ddab4e3171c1b77f1 100644 (file)
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -352,5 +352,33 @@ config QORIQ_CPUFREQ
          This adds the CPUFreq driver support for Freescale QorIQ SoCs
          which are capable of changing the CPU's frequency dynamically.
 
+comment "P-state Boost Solutions"
+
+choice PSTATE
+       prompt "P-state Boost Solution"
+       default PSTATE_DISABLE
+       help
+         Default status of P-state boost is disable.
+
+config PSTATE_DISABLE
+       bool "disable"
+       help
+         This option sets P-state boost solution as disable.
+         If in doubt, set this config.
+
+config PSTATE_EXYNOS_HAFM
+       bool "Exynos HAFM"
+       help
+         This option sets P-state boost solution as HAFM.
+         The config makes HIU just deliver frequency level and power budget
+         given from CPUFreq driver and register set.
+
+config PSTATE_EXYNOS_HAFM_TB
+       bool "Exynos HAFM-TB"
+       help
+         This option sets P-state boost solution as HAFM-TB.
+
+endchoice
+
 endif
 endmenu

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index ded5f935fafe01cc5143133d7a72f75bcb5f8e76..3d7f645707eb822d975f5bf54c44106e35afda3b 100644 (file)
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -304,8 +304,8 @@ config ARM_EXYNOS_ACME
 
 config ARM_EXYNOS_FF
        bool "SAMSUNG EXYNOS FF(Frequency Filter) driver"
-       depends on ARCH_EXYNOS && EXYNOS_HIU
-       default n
+       depends on ARCH_EXYNOS && (PSTATE_EXYNOS_HAFM || PSTATE_EXYNOS_HAFM_TB)
+       default y
          help
          This adds the CPUFreq driver for exynos chipsets which needs
          frequency filtering due to unnecessary frequency change request

diff --git a/drivers/soc/samsung/Makefile b/drivers/soc/samsung/Makefile
index ab3835e51cd8e1c34784ea41d43710d1e1bac85a..d679356531f371e0db9b1429576b63f8babca329 100644 (file)
--- a/drivers/soc/samsung/Makefile
+++ b/drivers/soc/samsung/Makefile
@@ -66,3 +66,7 @@ obj-$(CONFIG_ARCH_EXYNOS)       += secmem.o
 
 # HIU
 obj-$(CONFIG_EXYNOS_HIU)       += exynos-hiu.o
+
+# HAFM & HAFM-TB
+obj-$(CONFIG_PSTATE_EXYNOS_HAFM)       += exynos-hafm.o
+obj-$(CONFIG_PSTATE_EXYNOS_HAFM_TB)    += exynos-hafm-tb.o