Merge "ARM: dts: msm: Interconnect bus handling in video"

This commit is contained in:
qctecmdr 2021-05-22 23:24:36 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8a1f7f9abd

View file

@ -1,6 +1,3 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/msm/msm-bus-ids.h>
&soc {
msm_vidc: qcom,vidc@5a00000 {
compatible = "qcom,msm-vidc", "qcom,monaco-vidc";
@ -26,34 +23,16 @@
qcom,clock-configs = <0x1 0x0 0x0 0x1 0x0 0x0>;
qcom,allowed-clock-rates = <133330000 240000000>;
/* Buses */
bus_cnoc {
compatible = "qcom,msm-vidc,bus";
label = "cnoc";
qcom,bus-master = <MSM_BUS_MASTER_AMPSS_M0>;
qcom,bus-slave = <MSM_BUS_SLAVE_VENUS_CFG>;
qcom,mode = "performance";
qcom,bus-range-kbps = <1000 1000>;
};
venus_bus_ddr {
compatible = "qcom,msm-vidc,bus";
label = "venus-ddr";
qcom,bus-master = <MSM_BUS_MASTER_VIDEO_P0>;
qcom,bus-slave = <MSM_BUS_SLAVE_EBI_CH0>;
qcom,mode = "vidc-ar50-ddr";
qcom,bus-range-kbps = <1000 2128000>;
};
arm9_bus_ddr {
compatible = "qcom,msm-vidc,bus";
label = "venus-arm9-ddr";
qcom,bus-master = <MSM_BUS_MASTER_VIDEO_P0>;
qcom,bus-slave = <MSM_BUS_SLAVE_EBI_CH0>;
qcom,mode = "performance";
qcom,bus-range-kbps = <1000 1000>;
};
/* Bus Interconnects */
interconnect-names = "venus-cnoc", "venus-ddr";
interconnects = <&bimc MASTER_AMPSS_M0
&config_noc SLAVE_VENUS_CFG>,
<&mmnrt_virt MASTER_VIDEO_P0
&bimc SLAVE_EBI_CH0>;
/* Bus BW range (low, high) for each bus */
qcom,bus-range-kbps = <1000 1000
1000 2128000>;
/* MMUs */
non_secure_cb {
compatible = "qcom,msm-vidc,context-bank";
@ -107,4 +86,3 @@
};
};
};