diff --git a/display/sun-sde-display.dtsi b/display/sun-sde-display.dtsi index 0395bc34..ad74108e 100644 --- a/display/sun-sde-display.dtsi +++ b/display/sun-sde-display.dtsi @@ -132,7 +132,8 @@ }; &mdss_mdp { - connectors = <&sde_dsi &sde_dsi1 &smmu_sde_unsec &smmu_sde_sec &sde_wb1 &sde_wb2 &sde_dp>; + connectors = <&sde_dsi &sde_dsi1 &smmu_sde_unsec &smmu_sde_sec &sde_wb1 &sde_wb2 + &sde_dp &sde_cesta>; }; &dsi_vtdr6130_amoled_cmd { diff --git a/display/sun-sde.dtsi b/display/sun-sde.dtsi index 61a0bb97..18a66616 100644 --- a/display/sun-sde.dtsi +++ b/display/sun-sde.dtsi @@ -204,26 +204,63 @@ qcom,iommu-faults = "non-fatal"; qcom,iommu-vmid = <0xa>; }; + + sde_cesta: qcom,sde_cesta@0x0af30000 { + cell-index = <0>; + compatible = "qcom,sde-cesta"; + reg = <0xaf30000 0x60>, + <0xaf31000 0x30>, + <0xaf32000 0x30>, + <0xaf33000 0x30>, + <0xaf34000 0x30>, + <0xaf35000 0x30>, + <0xaf36000 0x30>; + reg-names = "wrapper", "scc_0", "scc_1", "scc_2", "scc_3", "scc_4", "scc_5"; + + clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>, + <&dispcc DISP_CC_MDSS_MDP_CLK_SRC>; + + clock-names = "branch_clk", "core_clk"; + clock-rate = <575000000 575000000>; + clock-max-rate = <575000000 575000000>; + clock-mmrm = <0 DISP_CC_MDSS_MDP_CLK_SRC>; + + interconnects = <&mmss_noc MASTER_MDP_DISP_CRM_HW_0 + &mc_virt SLAVE_EBI1_DISP_CRM_HW_0>, + <&mmss_noc MASTER_MDP_DISP_CRM_HW_1 + &mc_virt SLAVE_EBI1_DISP_CRM_HW_1>, + <&mmss_noc MASTER_MDP_DISP_CRM_HW_2 + &mc_virt SLAVE_EBI1_DISP_CRM_HW_2>, + <&mmss_noc MASTER_MDP_DISP_CRM_HW_3 + &mc_virt SLAVE_EBI1_DISP_CRM_HW_3>, + <&mmss_noc MASTER_MDP_DISP_CRM_HW_4 + &mc_virt SLAVE_EBI1_DISP_CRM_HW_4>, + <&mmss_noc MASTER_MDP_DISP_CRM_HW_5 + &mc_virt SLAVE_EBI1_DISP_CRM_HW_5>, + <&mmss_noc MASTER_MDP_DISP_CRM_SW_0 + &mc_virt SLAVE_EBI1_DISP_CRM_SW_0>; + interconnect-names = "qcom,sde-data-bus-hw-0", "qcom,sde-data-bus-hw-1", + "qcom,sde-data-bus-hw-2", "qcom,sde-data-bus-hw-3", + "qcom,sde-data-bus-hw-4", "qcom,sde-data-bus-hw-5", + "qcom,sde-data-bus-sw-0"; + + vdd-supply = <&disp_cc_mdss_core_gdsc>; + }; }; &mdss_mdp { clocks = <&gcc GCC_DISP_HF_AXI_CLK>, <&dispcc DISP_CC_MDSS_AHB_CLK>, - <&dispcc DISP_CC_MDSS_MDP_CLK>, - <&dispcc DISP_CC_MDSS_MDP_CLK_SRC>, <&dispcc DISP_CC_MDSS_VSYNC_CLK>, <&dispcc DISP_CC_MDSS_MDP_LUT_CLK>; - clock-names = "gcc_bus", - "iface_clk", "branch_clk", "core_clk", "vsync_clk", - "lut_clk"; - clock-rate = <0 0 575000000 575000000 19200000 575000000>; - clock-max-rate = <0 0 575000000 575000000 19200000 575000000>; - clock-mmrm = <0 0 0 DISP_CC_MDSS_MDP_CLK_SRC 0 0>; + + clock-names = "gcc_bus", "iface_clk", "vsync_clk", "lut_clk"; + clock-rate = <0 0 19200000 575000000>; + clock-max-rate = <0 0 19200000 575000000>; qcom,hw-fence-sw-version = <0x1>; - vdd-supply = <&disp_cc_mdss_core_gdsc>; mmcx-supply = <&VDD_MMCX_LEVEL>; qti,smmu-proxy-cb-id = ; @@ -262,15 +299,6 @@ qcom,supply-enable-load = <0>; qcom,supply-disable-load = <0>; }; - - qcom,platform-supply-entry@1 { - reg = <1>; - qcom,supply-name = "vdd"; - qcom,supply-min-voltage = <0>; - qcom,supply-max-voltage = <0>; - qcom,supply-enable-load = <0>; - qcom,supply-disable-load = <0>; - }; }; }; diff --git a/display/trustedvm-sun-sde.dtsi b/display/trustedvm-sun-sde.dtsi index 22855dd8..93aa250c 100644 --- a/display/trustedvm-sun-sde.dtsi +++ b/display/trustedvm-sun-sde.dtsi @@ -37,6 +37,14 @@ qcom,sde-vm-exclude-reg-names = "sid_phys"; + qcom,tvm-include-reg = <0xaf30000 0x60>, + <0xaf31000 0x30>, + <0xaf32000 0x30>, + <0xaf33000 0x30>, + <0xaf34000 0x30>, + <0xaf35000 0x30>, + <0xaf36000 0x30>; + qcom,sde-hw-version =<0xC0000000>; clocks = <&clock_cpucc GCC_DISP_AHB_CLK>,