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

Merge "ARM: dts: msm: Enable Cx ipeak support from multimedia clients on SDM660"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-08 15:47:25 -08:00 • committed by Gerrit - the friendly Code Review server
commit b9be5e00ae
4 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/boot/dts/qcom/sdm660-camera.dtsi
View file

@ -392,6 +392,7 @@
<106 512 0 0>, <106 512 0 0>,
<106 512 0 0>; <106 512 0 0>;
qcom,msm-bus-vector-dyn-vote; qcom,msm-bus-vector-dyn-vote;
qcom,cpp-cx-ipeak = <&cx_ipeak_lm 2>;
resets = <&clock_mmss CAMSS_MICRO_BCR>; resets = <&clock_mmss CAMSS_MICRO_BCR>;
reset-names = "micro_iface_reset"; reset-names = "micro_iface_reset";
qcom,src-clock-rates = <120000000 256000000 384000000 qcom,src-clock-rates = <120000000 256000000 384000000
@ -577,6 +578,7 @@
<29 512 0 0>, <29 512 0 0>,
<29 512 100000000 100000000>; <29 512 100000000 100000000>;
qcom,msm-bus-vector-dyn-vote; qcom,msm-bus-vector-dyn-vote;
qcom,vfe-cx-ipeak = <&cx_ipeak_lm 2>;
}; };
vfe1: qcom,vfe1@ca14000 { vfe1: qcom,vfe1@ca14000 {
@ -657,6 +659,7 @@
<29 512 0 0>, <29 512 0 0>,
<29 512 100000000 100000000>; <29 512 100000000 100000000>;
qcom,msm-bus-vector-dyn-vote; qcom,msm-bus-vector-dyn-vote;
qcom,vfe-cx-ipeak = <&cx_ipeak_lm 2>;
}; };
qcom,vfe { qcom,vfe {

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

@ -118,6 +118,10 @@
vddcx-supply = <&gdsc_gpu_cx>; vddcx-supply = <&gdsc_gpu_cx>;
vdd-supply = <&gdsc_gpu_gx>; vdd-supply = <&gdsc_gpu_gx>;
/* Cx ipeak limit supprt */
qcom,gpu-cx-ipeak = <&cx_ipeak_lm 1>;
qcom,gpu-cx-ipeak-clk = <700000000>;
/* CPU latency parameter */ /* CPU latency parameter */
qcom,pm-qos-active-latency = <518>; qcom,pm-qos-active-latency = <518>;
qcom,pm-qos-wakeup-latency = <518>; qcom,pm-qos-wakeup-latency = <518>;

1
arch/arm/boot/dts/qcom/sdm660-mdss.dtsi
View file

@ -50,6 +50,7 @@
qcom,vbif-settings = <0x00ac 0x00008040>, qcom,vbif-settings = <0x00ac 0x00008040>,
<0x00d0 0x00002828>; <0x00d0 0x00002828>;
qcom,mdss-cx-ipeak = <&cx_ipeak_lm 3>;
qcom,mdss-has-panic-ctrl; qcom,mdss-has-panic-ctrl;
qcom,mdss-per-pipe-panic-luts = <0x000f>, qcom,mdss-per-pipe-panic-luts = <0x000f>,
<0xffff>, <0xffff>,

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

@ -818,6 +818,11 @@
}; };
}; };
cx_ipeak_lm: cx_ipeak@1fe5040 {
compatible = "qcom,cx-ipeak-sdm660";
reg = <0x1fe5040 0x28>;
};
qcom,bcl { qcom,bcl {
compatible = "qcom,bcl"; compatible = "qcom,bcl";
qcom,bcl-enable; qcom,bcl-enable;
@ -2520,6 +2525,11 @@
}; };
}; };
&msm_vidc {
qcom,cx-ipeak-data = <&cx_ipeak_lm 4>;
qcom,clock-freq-threshold = <518400000>;
};
&soc { &soc {
gpio_keys { gpio_keys {
status = "okay"; status = "okay";