From 49225d22101f06e835bdc93cafc71ffd12489599 Mon Sep 17 00:00:00 2001 From: Narendra Muppalla Date: Wed, 3 Nov 2021 16:12:28 -0700 Subject: [PATCH 1/2] ARM: dts: msm: enable sde rscc on kalama target Enable sde RSCC device nodes for kalama target. Change-Id: I9825cf194ad8fb24080be770e2234c8bda55b9f8 --- display/kalama-sde-display.dtsi | 2 +- display/kalama-sde.dtsi | 42 ++++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/display/kalama-sde-display.dtsi b/display/kalama-sde-display.dtsi index 3ffc0327..4ec76f1c 100644 --- a/display/kalama-sde-display.dtsi +++ b/display/kalama-sde-display.dtsi @@ -100,7 +100,7 @@ }; &mdss_mdp { - connectors = <&sde_dsi &sde_dsi1 &smmu_sde_unsec &sde_wb1 &sde_wb2>; + connectors = <&sde_dsi &sde_dsi1 &smmu_sde_unsec &sde_wb1 &sde_wb2 &sde_rscc>; }; &dsi_vtdr6130_amoled_cmd { diff --git a/display/kalama-sde.dtsi b/display/kalama-sde.dtsi index 2bced577..567f5341 100644 --- a/display/kalama-sde.dtsi +++ b/display/kalama-sde.dtsi @@ -145,6 +145,28 @@ }; }; + sde_rscc: qcom,sde_rscc@af20000 { + cell-index = <0>; + compatible = "qcom,sde-rsc"; + reg = <0xaf20000 0x4d68>, + <0xaf30000 0x3fd4>; + reg-names = "drv", "wrapper"; + qcom,sde-rsc-version = <5>; + + qcom,sde-dram-channels = <2>; + + vdd-supply = <&disp_cc_mdss_core_gdsc>; + clocks = <&dispcc DISP_CC_MDSS_RSCC_VSYNC_CLK>, + <&dispcc DISP_CC_MDSS_NON_GDSC_AHB_CLK>, + <&dispcc DISP_CC_MDSS_RSCC_AHB_CLK>; + clock-names = "vsync_clk", "gdsc_clk", "iface_clk"; + + qcom,msm-bus,active-only; + interconnects = + <&mmss_noc MASTER_MDP_DISP &mc_virt SLAVE_EBI1_DISP>; + interconnect-names = "qcom,sde-data-bus0"; + }; + smmu_sde_unsec: qcom,smmu_sde_unsec_cb { compatible = "qcom,smmu_sde_unsec"; iommus = <&apps_smmu 0x1c00 0x2>; @@ -171,7 +193,6 @@ clock-max-rate = <0 0 0 514000000 514000000 19200000 514000000>; mmcx-supply = <&VDD_MMCX_LEVEL>; - vdd-supply = <&disp_cc_mdss_core_gdsc>; /* data and reg bus scale settings */ interconnects = <&mmss_noc MASTER_MDP &gem_noc SLAVE_LLCC>, @@ -198,18 +219,17 @@ qcom,supply-max-voltage = <0>; 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>; - }; - + }; }; }; + +&disp_rsc_drv0 { + sde_rsc_rpmh { + compatible = "qcom,sde-rsc-rpmh"; + cell-index = <0>; + }; +}; + &mdss_dsi0 { vdda-1p2-supply = <&L3E>; qcom,split-link-supported; From e3d842138c379745d13e623ae4dc7669e59d6baf Mon Sep 17 00:00:00 2001 From: Vara Reddy Date: Wed, 9 Mar 2022 15:58:11 -0800 Subject: [PATCH 2/2] ARM: dts: msm: enable sde_dp node for kalama target enable sde_dp node in device tree for kalama. Change-Id: I31afa79ecd59a81598c2c0ed01c5965b296d9ad9 --- display/kalama-sde-display.dtsi | 2 +- display/kalama-sde.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/display/kalama-sde-display.dtsi b/display/kalama-sde-display.dtsi index 4ec76f1c..71cfb200 100644 --- a/display/kalama-sde-display.dtsi +++ b/display/kalama-sde-display.dtsi @@ -100,7 +100,7 @@ }; &mdss_mdp { - connectors = <&sde_dsi &sde_dsi1 &smmu_sde_unsec &sde_wb1 &sde_wb2 &sde_rscc>; + connectors = <&sde_dsi &sde_dsi1 &smmu_sde_unsec &sde_wb1 &sde_wb2 &sde_rscc &sde_dp>; }; &dsi_vtdr6130_amoled_cmd { diff --git a/display/kalama-sde.dtsi b/display/kalama-sde.dtsi index 567f5341..d684ed00 100644 --- a/display/kalama-sde.dtsi +++ b/display/kalama-sde.dtsi @@ -16,13 +16,13 @@ }; sde_dp: qcom,dp_display@ae90000 { - status = "disabled"; cell-index = <0>; compatible = "qcom,dp-display"; usb-phy = <&usb_qmp_dp_phy>; + qcom,dp-aux-switch = <&fsa4480>; qcom,ext-disp = <&ext_disp>; - qcom,dp-hpd-gpio = <&tlmm 47 0>; + qcom,altmode-dev = <&altmode 0>; usb-controller = <&usb0>; reg = <0xae90000 0x0fc>,