Skip to content

Commit

Permalink
ARM: dts: msm8953-vince: Squash update some configuration from msm-4.9
Browse files Browse the repository at this point in the history 
ARM: dts: msm: Disable kpti for msm8953 and msm8937

Disable kpti via bootargs for msm8953 and msm8937
platforms which share same defconfig files.

Change-Id: I338759e2deba1460e3e47c23b98d43c93a255233
Signed-off-by: Maria Yu <[email protected]>

* Picked msm8953 changes only

ARM: dts: msm: Disable temperature based CPR adjustments for 8953/450

There are no significant savings using temperature (tsens)
based adjustments to CPR. Disable it for SDM450/MSM8953.

Change-Id: I7a01cc4996f68f78aa13eacf36648331a701882b
Signed-off-by: Anirudh Ghayal <[email protected]>
  • Loading branch information
@ramabondanp
ramabondanp committed Mar 9, 2019
1 parent 139fe70 commit f9d1d7d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 57 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/qcom/msm8953-e7.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
interrupt-parent = <&intc>;

chosen {
bootargs = "sched_enable_hmp=1 sched_enable_power_aware=1";
bootargs = "kpti=0 sched_enable_hmp=1 sched_enable_power_aware=1";
};

firmware: firmware {
Expand Down
56 changes: 0 additions & 56 deletions arch/arm/boot/dts/qcom/msm8953-regulator.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,9 +379,6 @@
"APCS_ALIAS0_APM_CTLER_STATUS",
"APCS0_CPR_CORE_ADJ_MODE_REG";

qcom,cpr-temp-point-map = <250 650 850>;
qcom,cpr-initial-temp-band = <0>;

/* Turbo (corner 6) ceiling voltage */
qcom,cpr-aging-ref-voltage = <990000>;

Expand Down Expand Up @@ -786,59 +783,6 @@
qcom,allow-quotient-interpolation;
qcom,cpr-scaled-open-loop-voltage-as-ceiling;

qcom,corner-allow-temp-adjustment =
/* Speed bin 0; CPR rev 0..7 */
<0 0 0 0 0 0 0 0 0>,
<0 0 0 0 0 0 0 0 0>,
<0 0 0 0 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,

/* Speed bin 2; CPR rev 0..7 */
<0 0 0 0 0 0 0 0 0>,
<0 0 0 0 0 0 0 0 0>,
<0 0 0 0 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,

/* Speed bin 6; CPR rev 0..7 */
<0 0 0 0 0 0 0>,
<0 0 0 0 0 0 0>,
<0 0 0 0 0 0 0>,
<1 1 1 1 0 0 0>,
<1 1 1 1 0 0 0>,
<1 1 1 1 0 0 0>,
<1 1 1 1 0 0 0>,
<1 1 1 1 0 0 0>,

/* Speed bin 7; CPR rev 0..7 */
<0 0 0 0 0 0 0 0 0>,
<0 0 0 0 0 0 0 0 0>,
<0 0 0 0 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>;

qcom,cpr-corner1-temp-core-voltage-adjustment =
<(0) (-5000) (-15000) (-20000)>;

qcom,cpr-corner2-temp-core-voltage-adjustment =
<(0) (-5000) (-15000) (-15000)>;

qcom,cpr-corner3-temp-core-voltage-adjustment =
<(0) (-5000) (-15000) (0)>;

qcom,cpr-corner4-temp-core-voltage-adjustment =
<(0) (-5000) (-15000) (0)>;

qcom,cpr-aging-max-voltage-adjustment = <15000>;
qcom,cpr-aging-ref-corner = <6>; /* Turbo */
qcom,cpr-aging-ro-scaling-factor = <2800>;
Expand Down

0 comments on commit f9d1d7d

Please sign in to comment.