evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "ARM: dts: msm: Enable ACD functionality for SDM660 silver cluster""

Browse source
This commit is contained in:
Linux Build Service Account 2018-02-26 19:08:42 -08:00 • committed by Gerrit - the friendly Code Review server
commit 8dfc7eb43e
3 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/boot/dts/qcom/sdm660-pm.dtsi
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. /* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -39,7 +39,7 @@
qcom,vctl-timeout-us = <500>; qcom,vctl-timeout-us = <500>;
qcom,vctl-port = <0x0>; qcom,vctl-port = <0x0>;
qcom,phase-port = <0x1>; qcom,phase-port = <0x1>;
qcom,saw2-avs-ctl = <0x101c031>; qcom,saw2-avs-ctl = <0x1010031>;
qcom,saw2-avs-limit = <0x4580458>; qcom,saw2-avs-limit = <0x4580458>;
qcom,pfm-port = <0x2>; qcom,pfm-port = <0x2>;
}; };

6
arch/arm/boot/dts/qcom/sdm660-regulator.dtsi
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. /* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -777,8 +777,8 @@
< (-4000) 4000 7000 19000 (-8000)>; < (-4000) 4000 7000 19000 (-8000)>;
qcom,cpr-closed-loop-voltage-fuse-adjustment = qcom,cpr-closed-loop-voltage-fuse-adjustment =
<(-32000) (-30000) (-29000) (-38000) <(-32000) (-30000) (-29000) (-23000)
(-36000)>; (-21000)>;
qcom,cpr-floor-to-ceiling-max-range = qcom,cpr-floor-to-ceiling-max-range =
<32000 32000 32000 40000 44000 <32000 32000 32000 40000 44000

14
arch/arm/boot/dts/qcom/sdm660.dtsi
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. /* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -1254,18 +1254,10 @@
compatible = "qcom,clk-cpu-osm"; compatible = "qcom,clk-cpu-osm";
reg = <0x179c0000 0x4000>, <0x17916000 0x1000>, reg = <0x179c0000 0x4000>, <0x17916000 0x1000>,
<0x17816000 0x1000>, <0x179d1000 0x1000>, <0x17816000 0x1000>, <0x179d1000 0x1000>,
<0x00784130 0x8>, <0x00784130 0x8>, <0x00784130 0x8>, <0x00784130 0x8>;
<0x17914800 0x800>;
reg-names = "osm", "pwrcl_pll", "perfcl_pll", reg-names = "osm", "pwrcl_pll", "perfcl_pll",
"apcs_common", "pwrcl_efuse", "apcs_common", "pwrcl_efuse",
"perfcl_efuse", "pwrcl_acd"; "perfcl_efuse";
qcom,acdtd-val = <0x0000a111 0x0000a111>;
qcom,acdcr-val = <0x002c5ffd 0x002c5ffd>;
qcom,acdsscr-val = <0x00000901 0x00000901>;
qcom,acdextint0-val = <0x2cf9ae8 0x2cf9ae8>;
qcom,acdextint1-val = <0x2cf9afe 0x2cf9afe>;
qcom,acdautoxfer-val = <0x00000015 0x00000015>;
vdd-pwrcl-supply = <&apc0_pwrcl_vreg>; vdd-pwrcl-supply = <&apc0_pwrcl_vreg>;
vdd-perfcl-supply = <&apc1_perfcl_vreg>; vdd-perfcl-supply = <&apc1_perfcl_vreg>;