--- arch/arm/mach-msm/Kconfig

+++ arch/arm/mach-msm/Kconfig

@@ -93,22 +93,22 @@ config PERFLOCK_SCREEN_POLICY

config PERFLOCK_SCREEN_ON_MIN

depends on PERFLOCK_SCREEN_POLICY

int "Minimum speed while screen on"

- default MSM_CPU_FREQ_ONDEMAND_MIN

+ default CPU_FREQ_MIN_FREQ

config PERFLOCK_SCREEN_ON_MAX

depends on PERFLOCK_SCREEN_POLICY

int "Maximum speed while screen on"

- default MSM_CPU_FREQ_ONDEMAND_MAX

+ default CPU_FREQ_MAX_FREQ

config PERFLOCK_SCREEN_OFF_MIN

depends on PERFLOCK_SCREEN_POLICY

int "Minimum speed while screen off"

- default MSM_CPU_FREQ_ONDEMAND_MIN

+ default CPU_FREQ_MIN_FREQ

config PERFLOCK_SCREEN_OFF_MAX

depends on PERFLOCK_SCREEN_POLICY

int "Maximum speed while screen off"

- default MSM_CPU_FREQ_ONDEMAND_MIN

+ default CPU_FREQ_MIN_FREQ

config MSM_AMSS_VERSION

int

@@ -702,13 +702,14 @@ config MSM_CPU_FREQ_SCREEN_ON

endif # MSM_CPU_FREQ_SCREEN

-config MSM_CPU_FREQ_ONDEMAND_MAX

- int "Max"

- default 384000

-

-config MSM_CPU_FREQ_ONDEMAND_MIN

- int "Min"

- default 245760

+config MSM_CPU_AVS

+ bool "Enable Adaptive Voltage Scaling (AVS)"

+ depends on (ARCH_MSM_SCORPION)

+ default n

+ help

+ This enables the Adaptive Voltage Scaling feature of

+ Qualcomm ARMv7 CPUs. It adjusts the voltage for each frequency

+ based on feedback from three ring oscillators in the CPU.

config MSM_HW3D

tristate "MSM Hardware 3D Register Driver"