From 5a9b3a252cf0a9fc0ed5aced75cf77d9fdeb9888 Mon Sep 17 00:00:00 2001 From: Abhijit Kulkarni Date: Wed, 19 Jan 2022 16:15:21 -0800 Subject: [PATCH] ARM: dts: msm: update trustedvm panel device tree This change updates the panel device tree entries for trustedvm and removes deprecated entries. Change-Id: I433468659661774b0975eaf6f1b617e504d88b64 --- display/trustedvm-kalama-sde-display-cdp.dtsi | 114 +++++++++--------- display/trustedvm-kalama-sde-display-mtp.dtsi | 87 +++++++------ display/trustedvm-kalama-sde-display-qrd.dtsi | 53 -------- .../trustedvm-kalama-sde-display-rumi.dtsi | 4 + display/trustedvm-kalama-sde-display.dtsi | 6 - 5 files changed, 106 insertions(+), 158 deletions(-) diff --git a/display/trustedvm-kalama-sde-display-cdp.dtsi b/display/trustedvm-kalama-sde-display-cdp.dtsi index 1d7cc1bb..2426595e 100644 --- a/display/trustedvm-kalama-sde-display-cdp.dtsi +++ b/display/trustedvm-kalama-sde-display-cdp.dtsi @@ -1,126 +1,122 @@ #include "trustedvm-kalama-sde-display.dtsi" -&dsi_r66451_amoled_cmd { +&dsi_vtdr6130_amoled_144hz_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-sec-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-min-level = <10>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-brightness-max-level = <255>; + qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 0 0>; + qcom,platform-reset-gpio = <&tlmm 133 0>; }; -&dsi_r66451_amoled_video { +&dsi_vtdr6130_amoled_144hz_video { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-min-level = <10>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-brightness-max-level = <255>; + qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - -&dsi_r66451_amoled_144hz_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-brightness-max-level = <255>; - qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 0 0>; + qcom,platform-reset-gpio = <&tlmm 133 0>; }; &dsi_sharp_4k_dsc_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; + qcom,platform-reset-gpio = <&tlmm 133 0>; + qcom,platform-bklight-en-gpio = <&tlmm 91 0>; }; &dsi_sharp_4k_dsc_video { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - -&dsi_sharp_1080_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; + qcom,platform-reset-gpio = <&tlmm 133 0>; + qcom,platform-bklight-en-gpio = <&tlmm 91 0>; }; &dsi_sharp_qsync_wqhd_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; + qcom,platform-reset-gpio = <&tlmm 133 0>; + qcom,platform-bklight-en-gpio = <&tlmm 91 0>; }; &dsi_sharp_qsync_wqhd_video { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; + qcom,platform-reset-gpio = <&tlmm 133 0>; + qcom,platform-bklight-en-gpio = <&tlmm 91 0>; }; &dsi_sharp_qhd_plus_dsc_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; + qcom,platform-reset-gpio = <&tlmm 133 0>; + qcom,platform-bklight-en-gpio = <&tlmm 91 0>; }; -&dsi_nt35695b_truly_fhd_cmd { +&dsi_r66451_amoled_144hz_cmd_cphy { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <10>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <8191>; + qcom,mdss-dsi-bl-inverted-dbv; + qcom,platform-reset-gpio = <&tlmm 133 0>; +}; + +&dsi_r66451_amoled_144hz_video_cphy { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <10>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <8191>; + qcom,mdss-dsi-bl-inverted-dbv; + qcom,platform-reset-gpio = <&tlmm 133 0>; +}; + +&dsi_dual_nt35597_truly_sl_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; + qcom,platform-reset-gpio = <&tlmm 133 0>; + qcom,platform-bklight-en-gpio = <&tlmm 91 0>; +}; + +&dsi_dual_nt35597_truly_cmd { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,platform-reset-gpio = <&tlmm 133 0>; +}; + +&dsi_dual_nt35597_truly_video { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,platform-reset-gpio = <&tlmm 133 0>; }; &dsi_sim_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - -&dsi_sim_vid { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; &dsi_sim_dsc_375_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; &dsi_sim_dsc_10b_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; &dsi_dual_sim_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; qcom,bl-dsc-cmd-state = "dsi_lp_mode"; }; -&dsi_dual_sim_vid { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - -&dsi_sim_vdc_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - -&dsi_sim_vdc_vid { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - &dsi_dual_sim_dsc_375_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; &dsi_sim_sec_hd_cmd { @@ -128,10 +124,8 @@ qcom,mdss-dsi-sec-bl-pmic-control-type = "bl_ctrl_dcs"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <1023>; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; &sde_dsi { - qcom,avdd-regulator-gpio = <&tlmm 64 0>; - qcom,dsi-default-panel = <&dsi_r66451_amoled_cmd>; + qcom,dsi-default-panel = <&dsi_vtdr6130_amoled_144hz_cmd>; }; diff --git a/display/trustedvm-kalama-sde-display-mtp.dtsi b/display/trustedvm-kalama-sde-display-mtp.dtsi index abfc4185..e61e7c67 100644 --- a/display/trustedvm-kalama-sde-display-mtp.dtsi +++ b/display/trustedvm-kalama-sde-display-mtp.dtsi @@ -1,107 +1,116 @@ #include "trustedvm-kalama-sde-display.dtsi" -&dsi_r66451_amoled_cmd { +&dsi_vtdr6130_amoled_144hz_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-min-level = <10>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-brightness-max-level = <255>; + qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 0 0>; + qcom,platform-reset-gpio = <&tlmm 133 0>; }; -&dsi_r66451_amoled_video { +&dsi_vtdr6130_amoled_144hz_video { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-min-level = <10>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-brightness-max-level = <255>; + qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - -&dsi_r66451_amoled_144hz_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-brightness-max-level = <255>; - qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 0 0>; + qcom,platform-reset-gpio = <&tlmm 133 0>; }; &dsi_sharp_4k_dsc_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; &dsi_sharp_4k_dsc_video { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - -&dsi_sharp_1080_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; &dsi_sharp_qsync_wqhd_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; &dsi_sharp_qsync_wqhd_video { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; &dsi_sharp_qhd_plus_dsc_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; -&dsi_nt35695b_truly_fhd_cmd { +&dsi_r66451_amoled_144hz_cmd_cphy { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <10>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <8191>; + qcom,mdss-dsi-bl-inverted-dbv; +}; + +&dsi_r66451_amoled_144hz_video_cphy { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <10>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <8191>; + qcom,mdss-dsi-bl-inverted-dbv; +}; + +&dsi_dual_nt35597_truly_sl_cmd { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <4095>; +}; + +&dsi_dual_nt35597_truly_cmd { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <4095>; +}; + +&dsi_dual_nt35597_truly_video { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; + qcom,mdss-dsi-bl-min-level = <1>; + qcom,mdss-dsi-bl-max-level = <4095>; +}; + +&dsi_sim_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; &dsi_sim_dsc_375_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; -&dsi_sim_vdc_cmd { +&dsi_sim_dsc_10b_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; -&dsi_sim_vdc_vid { +&dsi_dual_sim_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; + qcom,bl-dsc-cmd-state = "dsi_lp_mode"; }; &dsi_dual_sim_dsc_375_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; &dsi_sim_sec_hd_cmd { + qcom,panel-sec-supply-entries = <&dsi_panel_pwr_supply>; qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; qcom,mdss-dsi-sec-bl-pmic-control-type = "bl_ctrl_dcs"; qcom,mdss-dsi-bl-min-level = <1>; qcom,mdss-dsi-bl-max-level = <1023>; - qcom,platform-reset-gpio = <&tlmm 0 0>; }; &sde_dsi { - qcom,dsi-default-panel = <&dsi_r66451_amoled_cmd>; + qcom,dsi-default-panel = <&dsi_vtdr6130_amoled_144hz_cmd>; }; diff --git a/display/trustedvm-kalama-sde-display-qrd.dtsi b/display/trustedvm-kalama-sde-display-qrd.dtsi index 98997568..0d679f8f 100644 --- a/display/trustedvm-kalama-sde-display-qrd.dtsi +++ b/display/trustedvm-kalama-sde-display-qrd.dtsi @@ -1,31 +1,5 @@ #include "trustedvm-kalama-sde-display.dtsi" -&dsi_r66451_amoled_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-brightness-max-level = <255>; - qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - -&dsi_r66451_amoled_video { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-brightness-max-level = <255>; - qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - -&dsi_r66451_amoled_144hz_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,mdss-brightness-max-level = <255>; - qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; &dsi_sharp_4k_dsc_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; @@ -41,13 +15,6 @@ qcom,platform-reset-gpio = <&tlmm 0 0>; }; -&dsi_sharp_1080_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <4095>; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - &dsi_sharp_qsync_wqhd_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_external"; qcom,mdss-dsi-bl-min-level = <1>; @@ -69,26 +36,6 @@ qcom,platform-reset-gpio = <&tlmm 0 0>; }; -&dsi_nt35695b_truly_fhd_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - -&dsi_sim_dsc_375_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - -&dsi_sim_vdc_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - -&dsi_sim_vdc_vid { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,platform-reset-gpio = <&tlmm 0 0>; -}; - &dsi_dual_sim_dsc_375_cmd { qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; qcom,platform-reset-gpio = <&tlmm 0 0>; diff --git a/display/trustedvm-kalama-sde-display-rumi.dtsi b/display/trustedvm-kalama-sde-display-rumi.dtsi index 9aafae2f..ca6520be 100644 --- a/display/trustedvm-kalama-sde-display-rumi.dtsi +++ b/display/trustedvm-kalama-sde-display-rumi.dtsi @@ -4,6 +4,10 @@ qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; }; +&dsi_sim_vid { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; +}; + &sde_dsi { qcom,dsi-default-panel = <&dsi_sim_cmd>; }; diff --git a/display/trustedvm-kalama-sde-display.dtsi b/display/trustedvm-kalama-sde-display.dtsi index 6cf12aa3..9c5f7887 100644 --- a/display/trustedvm-kalama-sde-display.dtsi +++ b/display/trustedvm-kalama-sde-display.dtsi @@ -22,9 +22,3 @@ connectors = <&sde_dsi &sde_dsi1 &smmu_sde_unsec>; }; -&dsi_sw43404_amoled_cmd { - qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; - qcom,mdss-dsi-bl-min-level = <1>; - qcom,mdss-dsi-bl-max-level = <1023>; - qcom,mdss-brightness-max-level = <255>; -};