From 23c5cfd894a02b9bf8c6e716ff5b194694554085 Mon Sep 17 00:00:00 2001 From: Karthik Date: Tue, 9 May 2023 16:19:41 +0530 Subject: [PATCH 1/2] ARM: dts: msm: add trusted vm dt changes for crow This change includes display dt trusted vm changes for crow target. Change-Id: I98cd9ffb5657b925c076a0395743a92639d5e489 --- display/trustedvm-crow-sde.dtsi | 62 +++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 display/trustedvm-crow-sde.dtsi diff --git a/display/trustedvm-crow-sde.dtsi b/display/trustedvm-crow-sde.dtsi new file mode 100644 index 00000000..ef9daead --- /dev/null +++ b/display/trustedvm-crow-sde.dtsi @@ -0,0 +1,62 @@ +#include +#include +#include "crow-sde-common.dtsi" + +&soc { + /* dummy display clock provider */ + clock_cpucc: qcom,cpucc { + compatible = "qcom,dummycc"; + clock-output-names = "cpucc_clocks"; + #clock-cells = <1>; + }; + + smmu_sde_unsec: qcom,smmu_sde_unsec_cb { + compatible = "qcom,smmu_sde_unsec"; + iommus = <&apps_smmu 0x1c04 0x2>, + <&apps_smmu 0x1c03 0x0>; + qcom,iommu-dma-addr-pool = <0x00020000 0xfffe0000>; + qcom,iommu-faults = "non-fatal"; + dma-coherent; + }; +}; + +&mdss_mdp { + reg = <0x0ae00000 0x84000>, + <0x0aeb0000 0x2008>, + <0x0aeac000 0x800>, + <0x0ae8f000 0x02c>; + + reg-names = "mdp_phys", + "vbif_phys", + "regdma_phys", + "sid_phys"; + + qcom,sde-vm-exclude-reg-names = "sid_phys"; + + qcom,sde-hw-version =<0x90060000>; + + clocks = <&clock_cpucc GCC_DISP_HF_AXI_CLK>, + <&clock_cpucc DISP_CC_MDSS_AHB_CLK>, + <&clock_cpucc DISP_CC_MDSS_MDP_CLK>, + <&clock_cpucc DISP_CC_MDSS_MDP_CLK_SRC>, + <&clock_cpucc DISP_CC_MDSS_VSYNC_CLK>, + <&clock_cpucc DISP_CC_MDSS_MDP_LUT_CLK>; + clock-names = "gcc_bus", "iface_clk", "branch_clk", + "core_clk", "vsync_clk", "lut_clk"; + qcom,sde-trusted-vm-env; +}; + +&mdss_dsi0 { + clocks = <&clock_cpucc DISP_CC_MDSS_BYTE0_CLK>, + <&clock_cpucc DISP_CC_MDSS_BYTE0_CLK_SRC>, + <&clock_cpucc DISP_CC_MDSS_BYTE0_INTF_CLK>, + <&clock_cpucc DISP_CC_MDSS_PCLK0_CLK>, + <&clock_cpucc DISP_CC_MDSS_PCLK0_CLK_SRC>, + <&clock_cpucc DISP_CC_MDSS_ESC0_CLK>; + clock-names = "byte_clk", "byte_clk_rcg", "byte_intf_clk", + "pixel_clk", "pixel_clk_rcg", "esc_clk"; +}; + +&mdss_dsi_phy0 { + qcom,dsi-pll-in-trusted-vm; +}; From b5a8bbc62f31bc4e20028d09b88f7a2aeca2a990 Mon Sep 17 00:00:00 2001 From: Anand Tarakh Date: Thu, 11 May 2023 14:14:52 +0530 Subject: [PATCH 2/2] ARM: dts: msm: add trustedvm display platform overlay for crow target Add trustedvm display platform overlay for crow target. Change-Id: I0d77e10ac16a6503d0523a7c60b7d233610967fa --- Kbuild | 6 ++ ...trustedvm-crow-sde-display-atp-overlay.dts | 12 ++++ display/trustedvm-crow-sde-display-atp.dtsi | 1 + ...trustedvm-crow-sde-display-idp-overlay.dts | 12 ++++ ...tedvm-crow-sde-display-idp-wcd-overlay.dts | 12 ++++ .../trustedvm-crow-sde-display-idp-wcd.dtsi | 1 + display/trustedvm-crow-sde-display-idp.dtsi | 55 +++++++++++++++++++ ...trustedvm-crow-sde-display-qrd-overlay.dts | 12 ++++ display/trustedvm-crow-sde-display-qrd.dtsi | 5 ++ ...rustedvm-crow-sde-display-rumi-overlay.dts | 12 ++++ display/trustedvm-crow-sde-display-rumi.dtsi | 13 +++++ display/trustedvm-crow-sde-display.dtsi | 12 ++++ 12 files changed, 153 insertions(+) create mode 100644 display/trustedvm-crow-sde-display-atp-overlay.dts create mode 100644 display/trustedvm-crow-sde-display-atp.dtsi create mode 100644 display/trustedvm-crow-sde-display-idp-overlay.dts create mode 100644 display/trustedvm-crow-sde-display-idp-wcd-overlay.dts create mode 100644 display/trustedvm-crow-sde-display-idp-wcd.dtsi create mode 100644 display/trustedvm-crow-sde-display-idp.dtsi create mode 100644 display/trustedvm-crow-sde-display-qrd-overlay.dts create mode 100644 display/trustedvm-crow-sde-display-qrd.dtsi create mode 100644 display/trustedvm-crow-sde-display-rumi-overlay.dts create mode 100644 display/trustedvm-crow-sde-display-rumi.dtsi create mode 100644 display/trustedvm-crow-sde-display.dtsi diff --git a/Kbuild b/Kbuild index ac432cde..c22dae65 100644 --- a/Kbuild +++ b/Kbuild @@ -29,6 +29,12 @@ dtbo-$(CONFIG_ARCH_CROW) += display/crow-sde.dtbo \ display/crow-sde-display-atp-overlay.dtbo \ display/crow-sde-display-rumi-overlay.dtbo \ display/crow-sde-display-qrd-overlay.dtbo +else +dtbo-$(CONFIG_ARCH_CROW) += display/trustedvm-crow-sde-display-idp-overlay.dtbo \ + display/trustedvm-crow-sde-display-idp-wcd-overlay.dtbo \ + display/trustedvm-crow-sde-display-atp-overlay.dtbo \ + display/trustedvm-crow-sde-display-rumi-overlay.dtbo \ + display/trustedvm-crow-sde-display-qrd-overlay.dtbo endif ifeq ($(CONFIG_ARCH_SA8155), y) diff --git a/display/trustedvm-crow-sde-display-atp-overlay.dts b/display/trustedvm-crow-sde-display-atp-overlay.dts new file mode 100644 index 00000000..dcf1c7f9 --- /dev/null +++ b/display/trustedvm-crow-sde-display-atp-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include "trustedvm-crow-sde.dtsi" +#include "trustedvm-crow-sde-display-atp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Crow ATP - TrustedVM"; + compatible = "qcom,crow-atp", "qcom,crow", "qcom,atp"; + qcom,msm-id = <608 0x10000>; + qcom,board-id = <33 0>; +}; diff --git a/display/trustedvm-crow-sde-display-atp.dtsi b/display/trustedvm-crow-sde-display-atp.dtsi new file mode 100644 index 00000000..f41d7801 --- /dev/null +++ b/display/trustedvm-crow-sde-display-atp.dtsi @@ -0,0 +1 @@ +#include "trustedvm-crow-sde-display-idp.dtsi" diff --git a/display/trustedvm-crow-sde-display-idp-overlay.dts b/display/trustedvm-crow-sde-display-idp-overlay.dts new file mode 100644 index 00000000..74f8d8b6 --- /dev/null +++ b/display/trustedvm-crow-sde-display-idp-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include "trustedvm-crow-sde.dtsi" +#include "trustedvm-crow-sde-display-idp.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Crow IDP - TrustedVM"; + compatible = "qcom,crow-idp", "qcom,crow", "qcom,idp"; + qcom,msm-id = <608 0x10000>; + qcom,board-id = <34 0>; +}; diff --git a/display/trustedvm-crow-sde-display-idp-wcd-overlay.dts b/display/trustedvm-crow-sde-display-idp-wcd-overlay.dts new file mode 100644 index 00000000..dc39160b --- /dev/null +++ b/display/trustedvm-crow-sde-display-idp-wcd-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include "trustedvm-crow-sde.dtsi" +#include "trustedvm-crow-sde-display-idp-wcd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Crow IDP WCD - TrustedVM"; + compatible = "qcom,crow-idp", "qcom,crow", "qcom,idp"; + qcom,msm-id = <608 0x10000>; + qcom,board-id = <34 1>, <34 2>, <34 3>; +}; diff --git a/display/trustedvm-crow-sde-display-idp-wcd.dtsi b/display/trustedvm-crow-sde-display-idp-wcd.dtsi new file mode 100644 index 00000000..f41d7801 --- /dev/null +++ b/display/trustedvm-crow-sde-display-idp-wcd.dtsi @@ -0,0 +1 @@ +#include "trustedvm-crow-sde-display-idp.dtsi" diff --git a/display/trustedvm-crow-sde-display-idp.dtsi b/display/trustedvm-crow-sde-display-idp.dtsi new file mode 100644 index 00000000..51a9fd18 --- /dev/null +++ b/display/trustedvm-crow-sde-display-idp.dtsi @@ -0,0 +1,55 @@ +#include "trustedvm-crow-sde-display.dtsi" + +&dsi_vtdr6130_amoled_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 = <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 127 0>; +}; + +&dsi_vtdr6130_amoled_video { + 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 = <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 127 0>; +}; + +&dsi_vtdr6130_amoled_qsync_144hz_cmd { + 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 127 0>; +}; + +&dsi_vtdr6130_amoled_qsync_144hz_video { + 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 127 0>; +}; + +&dsi_sim_cmd { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; +}; + +&dsi_sim_dsc_375_cmd { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; +}; + +&dsi_sim_dsc_10b_cmd { + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; +}; + +&sde_dsi { + qcom,dsi-default-panel = <&dsi_vtdr6130_amoled_video>; +}; diff --git a/display/trustedvm-crow-sde-display-qrd-overlay.dts b/display/trustedvm-crow-sde-display-qrd-overlay.dts new file mode 100644 index 00000000..67531de0 --- /dev/null +++ b/display/trustedvm-crow-sde-display-qrd-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include "trustedvm-crow-sde.dtsi" +#include "trustedvm-crow-sde-display-qrd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Crow QRD - TrustedVM"; + compatible = "qcom,crow-qrd", "qcom,crow", "qcom,qrd"; + qcom,msm-id = <608 0x10000>; + qcom,board-id = <11 0>; +}; diff --git a/display/trustedvm-crow-sde-display-qrd.dtsi b/display/trustedvm-crow-sde-display-qrd.dtsi new file mode 100644 index 00000000..58daa025 --- /dev/null +++ b/display/trustedvm-crow-sde-display-qrd.dtsi @@ -0,0 +1,5 @@ +#include "trustedvm-crow-sde-display-idp.dtsi" + +&sde_dsi { + qcom,dsi-default-panel = <&dsi_vtdr6130_amoled_cmd>; +}; diff --git a/display/trustedvm-crow-sde-display-rumi-overlay.dts b/display/trustedvm-crow-sde-display-rumi-overlay.dts new file mode 100644 index 00000000..46176c81 --- /dev/null +++ b/display/trustedvm-crow-sde-display-rumi-overlay.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include "trustedvm-crow-sde.dtsi" +#include "trustedvm-crow-sde-display-rumi.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Crow RUMI - TrustedVM"; + compatible = "qcom,crow-rumi", "qcom,crow", "qcom,rumi"; + qcom,msm-id = <608 0x10000>; + qcom,board-id = <15 0>; +}; diff --git a/display/trustedvm-crow-sde-display-rumi.dtsi b/display/trustedvm-crow-sde-display-rumi.dtsi new file mode 100644 index 00000000..04d54ca7 --- /dev/null +++ b/display/trustedvm-crow-sde-display-rumi.dtsi @@ -0,0 +1,13 @@ +#include "trustedvm-crow-sde-display.dtsi" + +&dsi_sim_cmd { + 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_vid>; +}; diff --git a/display/trustedvm-crow-sde-display.dtsi b/display/trustedvm-crow-sde-display.dtsi new file mode 100644 index 00000000..7aefbb73 --- /dev/null +++ b/display/trustedvm-crow-sde-display.dtsi @@ -0,0 +1,12 @@ +#include "crow-sde-display-common.dtsi" + +&sde_dsi { + clocks = <&clock_cpucc 0>, + <&clock_cpucc 1>; + clock-names = "pll_byte_clk0", "pll_dsi_clk0"; +}; + +&mdss_mdp { + connectors = <&sde_dsi &smmu_sde_unsec>; +}; +