aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRygebin <kaankulahli@gmail.com>2017-06-20 14:29:27 +0000
committerRygebin <kaankulahli@gmail.com>2017-06-20 14:29:27 +0000
commitafa9ad70f02491fbe10df2203f8f2fa42f956228 (patch)
treeb6dce4ed04f62fd443721a94ac3e7f81427e0ad1 /arch
parent582eb92a1e8bf6c0e743774c1fb550e630715433 (diff)
parent08d1ec9238c605a9a5cf1229fd60961efcd21ff1 (diff)
Merge https://github.com/OneDeveloperOrganization/android_kernel_google_shamrock into n7.1HEADn7.1
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/qcom/msm8952-gpu.dtsi2
-rw-r--r--arch/arm/configs/msm8952-perf_defconfig1
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8952-gpu.dtsi b/arch/arm/boot/dts/qcom/msm8952-gpu.dtsi
index bc55234b1d8..e3cc821c69a 100644
--- a/arch/arm/boot/dts/qcom/msm8952-gpu.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8952-gpu.dtsi
@@ -56,7 +56,7 @@
qcom,chipid = <0x04000510>;
- qcom,initial-pwrlevel = <3>;
+ qcom,initial-pwrlevel = <4>;
qcom,idle-timeout = <80>; //<msec>
qcom,strtstp-sleepwake;
diff --git a/arch/arm/configs/msm8952-perf_defconfig b/arch/arm/configs/msm8952-perf_defconfig
index 68032acab88..3e74e12a6c1 100644
--- a/arch/arm/configs/msm8952-perf_defconfig
+++ b/arch/arm/configs/msm8952-perf_defconfig
@@ -57,7 +57,6 @@ CONFIG_AEABI=y
CONFIG_BALANCE_ANON_FILE_RECLAIM=y
CONFIG_HIGHMEM=y
CONFIG_ENABLE_VMALLOC_SAVING=y
-CONFIG_CP_ACCESS=y
CONFIG_AUTO_ZRELADDR=y
CONFIG_ARM_DECOMPRESSOR_LIMIT=0x3200000
CONFIG_SCHED_FREQ_INPUT=y