diff options
| author | Dhaval Patel <pdhaval@quicinc.com> | 2016-10-25 21:14:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-25 21:14:29 -0700 |
| commit | 5204ca9e7f3eab41bc5e39227de75acf7551e83e (patch) | |
| tree | 062aec4b9a3cf0a17b7f7d50ab07ad248f009d85 | |
| parent | cb5616441ece9c1ae9c114afe3b4007f659bbe46 (diff) | |
| parent | adf22d0f467d25624fcb43d9708f6239958a39a4 (diff) | |
Merge "ARM: dts: msm: add vbif OT and plane QoS/LUT for msm8996" into dev/msm-4.4-drm_kms
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-sde.dtsi | 19 |
2 files changed, 18 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi b/arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi index db123171015a..05be00c7fd97 100644 --- a/arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-sde-display.dtsi @@ -216,7 +216,7 @@ sde_wb: qcom,wb-display@0 { compatible = "qcom,wb-display"; - cell-index = <2>; + cell-index = <0>; label = "wb_display"; }; diff --git a/arch/arm/boot/dts/qcom/msm8996-sde.dtsi b/arch/arm/boot/dts/qcom/msm8996-sde.dtsi index ea14b16df0af..513788af9b09 100644 --- a/arch/arm/boot/dts/qcom/msm8996-sde.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-sde.dtsi @@ -58,8 +58,10 @@ qcom,sde-mixer-off = <0x45000 0x46000 0x47000 0x48000 0x49000 0x4a000>; qcom,sde-dspp-off = <0x55000 0x57000>; - qcom,sde-wb-off = <0x65000 0x65800 0x66000>; - qcom,sde-wb-xin-id = <3 11 6>; + qcom,sde-wb-off = <0x66000>; + qcom,sde-wb-id = <2>; + qcom,sde-wb-xin-id = <6>; + qcom,sde-wb-clk-ctrl = <0x2bc 16>; qcom,sde-intf-off = <0x6b000 0x6b800 0x6c000 0x6c800>; qcom,sde-intf-type = "none", "dsi", "dsi", "hdmi"; @@ -101,6 +103,19 @@ qcom,sde-has-cdp; qcom,sde-has-src-split; + qcom,sde-sspp-danger-lut = <0x000f 0xffff 0x0000>; + qcom,sde-sspp-safe-lut = <0xfffc 0xff00 0xffff>; + + qcom,sde-vbif-off = <0 0>; + qcom,sde-vbif-size = <0x1040>; + qcom,sde-vbif-id = <0 1>; + qcom,sde-vbif-default-ot-rd-limit = <32>; + qcom,sde-vbif-default-ot-wr-limit = <16>; + qcom,sde-vbif-dynamic-ot-rd-limit = <62208000 2>, + <124416000 4>, <248832000 16>; + qcom,sde-vbif-dynamic-ot-wr-limit = <62208000 2>, + <124416000 4>, <248832000 16>; + mmagic-supply = <&gdsc_mmagic_mdss>; vdd-supply = <&gdsc_mdss>; |