diff --git a/display/lahaina-sde.dtsi b/display/lahaina-sde.dtsi index 064acfdf25bd..a15358489303 100644 --- a/display/lahaina-sde.dtsi +++ b/display/lahaina-sde.dtsi @@ -214,6 +214,15 @@ qcom,sde-secure-sid-mask = <0x4000821>; + /* data and reg bus scale settings */ + interconnects = + <&mmss_noc MASTER_MDP0 &mc_virt SLAVE_EBI1>, + <&mmss_noc MASTER_MDP1 &mc_virt SLAVE_EBI1>, + <&gem_noc MASTER_APPSS_PROC + &config_noc SLAVE_DISPLAY_CFG>; + interconnect-names = "qcom,sde-data-bus0", "qcom,sde-data-bus1", + "qcom,sde-reg-bus"; + qcom,sde-sspp-vig-blocks { qcom,sde-vig-csc-off = <0x1a00>; qcom,sde-vig-qseed-off = <0xa00>; @@ -291,27 +300,6 @@ qcom,iommu-vmid = <0xa>; }; - /* data and reg bus scale settings */ - qcom,sde-data-bus { - qcom,msm-bus,name = "mdss_sde"; - qcom,msm-bus,num-cases = <3>; - qcom,msm-bus,num-paths = <2>; - qcom,msm-bus,vectors-KBps = - <22 512 0 0>, <23 512 0 0>, - <22 512 0 6400000>, <23 512 0 6400000>, - <22 512 0 6400000>, <23 512 0 6400000>; - }; - - qcom,sde-reg-bus { - qcom,msm-bus,name = "mdss_reg"; - qcom,msm-bus,num-cases = <4>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = - <1 590 0 0>, - <1 590 0 76800>, - <1 590 0 150000>, - <1 590 0 300000>; - }; }; sde_dp: qcom,dp_display@ae90000 { @@ -435,40 +423,10 @@ <&clock_dispcc DISP_CC_MDSS_NON_GDSC_AHB_CLK>, <&clock_dispcc DISP_CC_MDSS_RSCC_AHB_CLK>; clock-names = "vsync_clk", "gdsc_clk", "iface_clk"; - - /* data and reg bus scale settings */ - qcom,sde-data-bus { - qcom,msm-bus,name = "disp_rsc_mnoc_llcc"; - qcom,msm-bus,active-only; - qcom,msm-bus,num-cases = <3>; - qcom,msm-bus,num-paths = <2>; - qcom,msm-bus,vectors-KBps = - <20003 20513 0 0>, <20004 20513 0 0>, - <20003 20513 0 6400000>, <20004 20513 0 6400000>, - <20003 20513 0 6400000>, <20004 20513 0 6400000>; - }; - - qcom,sde-ebi-bus { - qcom,msm-bus,name = "disp_rsc_ebi"; - qcom,msm-bus,active-only; - qcom,msm-bus,num-cases = <3>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = - <20000 20512 0 0>, - <20000 20512 0 6400000>, - <20000 20512 0 6400000>; - }; - - qcom,sde-reg-bus { - qcom,msm-bus,name = "disp_rsc_reg"; - qcom,msm-bus,num-cases = <4>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = - <1 590 0 0>, - <1 590 0 76800>, - <1 590 0 150000>, - <1 590 0 300000>; - }; + interconnects = + <&gem_noc MASTER_APPSS_PROC + &config_noc SLAVE_DISPLAY_CFG>; + interconnect-names = "qcom,sde-reg-bus"; }; mdss_rotator: qcom,mdss_rotator@aea9000 { @@ -483,15 +441,13 @@ qcom,mdss-rot-mode = <1>; qcom,mdss-highest-bank-bit = <0x3>; - - /* Bus Scale Settings */ - qcom,msm-bus,name = "mdss_rotator"; - qcom,msm-bus,num-cases = <3>; - qcom,msm-bus,num-paths = <1>; - qcom,msm-bus,vectors-KBps = - <25 512 0 0>, - <25 512 0 6400000>, - <25 512 0 6400000>; + interconnects = + <&mmss_noc MASTER_ROTATOR &mc_virt SLAVE_EBI1>, + <&gem_noc MASTER_APPSS_PROC + &config_noc SLAVE_DISPLAY_CFG>; + interconnect-names = "qcom,rot-data-bus0", + "qcom,sde-reg-bus"; + qcom,msm-bus,active-only; qcom,supply-names = "rot-vdd";