Merge branch 'LA.UM.9.12.C10.11.00.00.840.535' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19 Bug: 272199761 Change-Id: Ib48da9549c44571ec74c6fabe38cb67b86d7b4f0 Signed-off-by: JohnnLee <johnnlee@google.com>
diff --git a/qcom/dsi-panel-xrsmrtvwr-jdi-dual-video.dtsi b/qcom/dsi-panel-xrsmrtvwr-jdi-dual-video.dtsi index e6ce614..7093e4d 100644 --- a/qcom/dsi-panel-xrsmrtvwr-jdi-dual-video.dtsi +++ b/qcom/dsi-panel-xrsmrtvwr-jdi-dual-video.dtsi
@@ -14,6 +14,7 @@ qcom,dsi-ctrl-num = <0 1>; qcom,dsi-phy-num = <0 1>; qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; + qcom,cmd-sync-wait-broadcast; qcom,mdss-dsi-traffic-mode = "non_burst_sync_event"; qcom,mdss-dsi-bllp-eof-power-mode;
diff --git a/qcom/kona-xrsku4.dtsi b/qcom/kona-xrsku4.dtsi index 34248a1..d7db8a3 100644 --- a/qcom/kona-xrsku4.dtsi +++ b/qcom/kona-xrsku4.dtsi
@@ -1302,10 +1302,11 @@ qcom,5v-boost-gpio = <&tlmm 134 0>; /delete-property/ qcom,platform-en-gpio; + qcom,esd-check-enabled; + qcom,mdss-dsi-panel-status-check-mode = "reg_read"; qcom,mdss-dsi-panel-status-command = [06 01 00 01 00 00 01 0a]; qcom,mdss-dsi-panel-status-command-state = "dsi_hs_mode"; - qcom,mdss-dsi-panel-status-value = <0x9c>; - qcom,mdss-dsi-panel-on-check-value = <0x9c>; + qcom,mdss-dsi-panel-status-value = <0x1c>; qcom,mdss-dsi-panel-status-read-length = <1>; qcom,dsi-select-clocks = "mux_byte_clk0", "mux_pixel_clk0"; qcom,mdss-dsi-min-refresh-rate = <60>;
diff --git a/qcom/sdm660.dtsi b/qcom/sdm660.dtsi index 2ea89c0..2050ad8 100644 --- a/qcom/sdm660.dtsi +++ b/qcom/sdm660.dtsi
@@ -1709,7 +1709,7 @@ reg-names = "dcc-base", "dcc-ram-base"; clocks = <&clock_gcc GCC_DCC_AHB_CLK>; - clock-names = "dcc_clk"; + clock-names = "apb_pclk"; }; tcsr_mutex_block: syscon@1f40000 {