diff options
| author | Vishwanath BS <vishwanath.bs@ti.com> | 2012-03-14 14:09:24 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-06-20 10:27:45 +0800 |
| commit | 80325b72e1aa987d54e20f4ea7074022ef39648d (patch) | |
| tree | 633555ccd5a57e85c8063c1af8cae5a8d256ebe5 | |
| parent | e72af8beedaafb7874cb5670246fb87043c4e4e6 (diff) | |
OMAP2PLUS: DVFS: DVFS Control via CPUFREQ
Instead of using seperate config entry for DVFS, use CPUFREQ to enable/disable
DVFS. There is no pointing in having DVFS w/o CPUFREQ and visa versa.
Signed-off-by: Vishwanath BS <vishwanath.bs@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/dvfs.h | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index cef465fe042..d137426c91d 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -438,13 +438,6 @@ config OMAP_ALLOW_OSWR Select this option to enable OSWR support. Which means the Logic of power domains can be lost now unlike the CSWR wherein the logic is retained - -config OMAP_DVFS - bool "Enable OMAP DVFS" - depends on ARCH_OMAP5 - default n - help - Select this option to enable DVFS support on OMAP endmenu endif diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 1ce69c3629a..085430751e6 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -70,7 +70,7 @@ endif obj-$(CONFIG_ARCH_OMAP5) += opp4xxx_data.o # CPUFREQ driver -obj-$(CONFIG_CPU_FREQ) += omap2plus-cpufreq.o +obj-$(CONFIG_CPU_FREQ) += omap2plus-cpufreq.o dvfs.o # Power Management ifeq ($(CONFIG_PM),y) @@ -117,8 +117,6 @@ obj-$(CONFIG_ARCH_OMAP5) += prcm.o cm2xxx_3xxx.o cminst44xx.o \ vp54xx_data.o dvfs.o abb54xx_data.o \ prm44xx.o scrm44xx.o omap-sar.o -obj-$(CONFIG_OMAP_DVFS) += dvfs.o - # OMAP voltage domains voltagedomain-common := voltage.o vc.o vp.o abb.o obj-$(CONFIG_ARCH_OMAP2) += $(voltagedomain-common) \ diff --git a/arch/arm/mach-omap2/dvfs.h b/arch/arm/mach-omap2/dvfs.h index 8f476b32680..62ce0cdb8a4 100644 --- a/arch/arm/mach-omap2/dvfs.h +++ b/arch/arm/mach-omap2/dvfs.h @@ -16,7 +16,7 @@ #include <plat/omap_hwmod.h> #include "voltage.h" -#ifdef CONFIG_OMAP_DVFS +#ifdef CONFIG_CPU_FREQ #include <linux/mutex.h> extern struct mutex omap_dvfs_lock; |