Commit e34c2f02 authored by Dennis Rassmann's avatar Dennis Rassmann
Browse files

Merge branch 'exp'

No related merge requests found
......@@ -431,11 +431,13 @@ CONFIG_MSM_IPC_ROUTER=y
CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y
# CONFIG_MSM_DALRPC is not set
CONFIG_MSM_MPDEC=y
CONFIG_MSM_MPDEC_INPUTBOOST_CPUMIN=y
CONFIG_MSM_CPU_FREQ_SET_MIN_MAX=y
CONFIG_MSM_CPU_FREQ_MAX=1512000
CONFIG_MSM_CPU_FREQ_MIN=384000
CONFIG_CPU_OVERCLOCK=y
CONFIG_CPU_VOLTAGE_TABLE=y
CONFIG_CMDLINE_OPTIONS=y
# CONFIG_MSM_AVS_HW is not set
# CONFIG_MSM_HW3D is not set
CONFIG_AMSS_7X25_VERSION_2009=y
......@@ -3122,6 +3124,7 @@ CONFIG_HAVE_CLK_PREPARE=y
#
CONFIG_IOMMU_SUPPORT=y
CONFIG_MSM_IOMMU=y
CONFIG_MSM_IOMMU_GPU_SYNC=y
CONFIG_IOMMU_PGTABLES_L2=y
#
......
......@@ -1640,6 +1640,13 @@ config MSM_MPDEC
This enables kernel based multi core control.
(up/down hotplug based on load)
config MSM_MPDEC_INPUTBOOST_CPUMIN
bool "Enable kernel based mpdecision"
depends on MSM_MPDEC
default n
help
This pushes the cpu min speed to predefined values on input events.
if CPU_FREQ_MSM
config MSM_CPU_FREQ_SET_MIN_MAX
......@@ -1669,6 +1676,12 @@ config CPU_VOLTAGE_TABLE
bool "Enable CPU Voltage Table via sysfs for adjustements"
default n
config CMDLINE_OPTIONS
bool "Enable cmdline s2w/khz/gov/maxscroff/scheduler command parsing"
default n
help
This enables the parsing of special cmdline variables.
config MSM_CPU_AVS
bool "Enable software controlled Adaptive Voltage Scaling (AVS)"
depends on (ARCH_MSM_SCORPION && QSD_SVS)
......
This diff is collapsed.
This diff is collapsed.
......@@ -14,6 +14,8 @@
#ifndef __MSM_THERMAL_H
#define __MSM_THERMAL_H
#include <asm/cputime.h>
struct msm_thermal_data {
uint32_t sensor_id;
uint32_t poll_ms;
......@@ -32,6 +34,15 @@ struct msm_thermal_data {
uint32_t allowed_low_freq;
};
struct msm_thermal_stat {
cputime64_t time_low_start;
cputime64_t time_mid_start;
cputime64_t time_max_start;
cputime64_t time_low;
cputime64_t time_mid;
cputime64_t time_max;
};
#ifdef CONFIG_THERMAL_MONITOR
extern int msm_thermal_init(struct msm_thermal_data *pdata);
extern int msm_thermal_device_init(void);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment