Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd289c8a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: qcom: Update the bus interconnect topology for LITO"

parents a11fd208 42cf9063
Loading
Loading
Loading
Loading
+24 −57
Original line number Diff line number Diff line
@@ -340,18 +340,6 @@
			clocks = <>;
		};

		fab_camnoc_virt: fab-camnoc_virt {
			cell-id = <MSM_BUS_FAB_CAMNOC_VIRT>;
			label = "fab-camnoc_virt";
			qcom,fab-dev;
			qcom,base-name = "camnoc_virt-base";
			qcom,qos-off = <0>;
			qcom,base-offset = <0>;
			qcom,sbm-offset = <0>;
			qcom,bypass-qos-prg;
			clocks = <>;
		};

		fab_compute_noc: fab-compute_noc {
			cell-id = <MSM_BUS_FAB_COMP_NOC>;
			label = "fab-compute_noc";
@@ -660,33 +648,6 @@
			qcom,prio = <2>;
		};

		mas_qxm_camnoc_hf0_uncomp: mas-qxm-camnoc-hf0-uncomp {
			cell-id = <MSM_BUS_MASTER_CAMNOC_HF0_UNCOMP>;
			label = "mas-qxm-camnoc-hf0-uncomp";
			qcom,buswidth = <32>;
			qcom,agg-ports = <1>;
			qcom,connections = <&slv_qns_camnoc_uncomp>;
			qcom,bus-dev = <&fab_camnoc_virt>;
		};

		mas_qxm_camnoc_hf1_uncomp: mas-qxm-camnoc-hf1-uncomp {
			cell-id = <MSM_BUS_MASTER_CAMNOC_HF1_UNCOMP>;
			label = "mas-qxm-camnoc-hf1-uncomp";
			qcom,buswidth = <32>;
			qcom,agg-ports = <1>;
			qcom,connections = <&slv_qns_camnoc_uncomp>;
			qcom,bus-dev = <&fab_camnoc_virt>;
		};

		mas_qxm_camnoc_sf_uncomp: mas-qxm-camnoc-sf-uncomp {
			cell-id = <MSM_BUS_MASTER_CAMNOC_SF_UNCOMP>;
			label = "mas-qxm-camnoc-sf-uncomp";
			qcom,buswidth = <32>;
			qcom,agg-ports = <1>;
			qcom,connections = <&slv_qns_camnoc_uncomp>;
			qcom,bus-dev = <&fab_camnoc_virt>;
		};

		mas_qnm_npu: mas-qnm-npu {
			cell-id = <MSM_BUS_MASTER_NPU>;
			label = "mas-qnm-npu";
@@ -941,9 +902,23 @@
			qcom,bus-dev = <&fab_mmss_noc>;
		};

		mas_qxm_camnoc_hf: mas-qxm-camnoc-hf {
			cell-id = <MSM_BUS_MASTER_CAMNOC_HF>;
			label = "mas-qxm-camnoc-hf";
		mas_qxm_camnoc_icp: mas-qxm-camnoc-icp {
			cell-id = <MSM_BUS_MASTER_CAMNOC_ICP>;
			label = "mas-qxm-camnoc-icp";
			qcom,buswidth = <8>;
			qcom,agg-ports = <1>;
			qcom,qport = <258>;
			qcom,connections = <&slv_qns_mem_noc_sf>;
			qcom,bus-dev = <&fab_mmss_noc>;
			qcom,bcms = <&bcm_mm3>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
		};

		mas_qxm_camnoc_hf0: mas-qxm-camnoc-hf0 {
			cell-id = <MSM_BUS_MASTER_CAMNOC_HF0>;
			label = "mas-qxm-camnoc-hf0";
			qcom,buswidth = <32>;
			qcom,agg-ports = <2>;
			qcom,qport = <32 64>;
@@ -955,15 +930,15 @@
			qcom,forwarding;
		};

		mas_qxm_camnoc_icp: mas-qxm-camnoc-icp {
			cell-id = <MSM_BUS_MASTER_CAMNOC_ICP>;
			label = "mas-qxm-camnoc-icp";
		mas_qxm_camnoc_hf1: mas-qxm-camnoc-hf1 {
			cell-id = <MSM_BUS_MASTER_CAMNOC_HF1>;
			label = "mas-qxm-camnoc-hf1";
			qcom,buswidth = <32>;
			qcom,agg-ports = <1>;
			qcom,qport = <257>;
			qcom,connections = <&slv_qns_mem_noc_hf>;
			qcom,bus-dev = <&fab_mmss_noc>;
			qcom,bcms = <&bcm_mm3>;
			qcom,bcms = <&bcm_mm1>;
			qcom,ap-owned;
			qcom,prio = <0>;
			qcom,forwarding;
@@ -972,9 +947,9 @@
		mas_qxm_camnoc_sf: mas-qxm-camnoc-sf {
			cell-id = <MSM_BUS_MASTER_CAMNOC_SF>;
			label = "mas-qxm-camnoc-sf";
			qcom,buswidth = <8>;
			qcom,agg-ports = <2>;
			qcom,qport = <0 258>;
			qcom,buswidth = <32>;
			qcom,agg-ports = <1>;
			qcom,qport = <258>;
			qcom,connections = <&slv_qns_mem_noc_sf>;
			qcom,bus-dev = <&fab_mmss_noc>;
			qcom,bcms = <&bcm_mm3>;
@@ -1260,14 +1235,6 @@
			qcom,bus-dev = <&fab_aggre2_noc>;
		};

		slv_qns_camnoc_uncomp:slv-qns-camnoc-uncomp {
			cell-id = <MSM_BUS_SLAVE_CAMNOC_UNCOMP>;
			label = "slv-qns-camnoc-uncomp";
			qcom,buswidth = <32>;
			qcom,agg-ports = <1>;
			qcom,bus-dev = <&fab_camnoc_virt>;
		};

		slv_qns_cdsp_gem_noc:slv-qns-cdsp-gem-noc {
			cell-id = <MSM_BUS_SLAVE_CDSP_GEM_NOC>;
			label = "slv-qns-cdsp-gem-noc";