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

Commit 9027539e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add Virtual IPA Nodes for sdm845" into msm-4.9

parents 9c8940bd f931d700

arch/arm64/boot/dts/qcom/sdm845-bus.dtsi

+29 −2
Original line number Diff line number Diff line
@@ -24,12 +24,13 @@ 
			<0x1380000 0x40000>,

			<0x1380000 0x40000>,

			<0x1740000 0x40000>,

			<0x1620000 0x40000>,

			<0x1620000 0x40000>;



		reg-names = "aggre1_noc-base", "aggre2_noc-base",

			"config_noc-base", "dc_noc-base",

			"gladiator_noc-base", "mc_virt-base", "mem_noc-base",

			"mmss_noc-base", "system_noc-base";

			"mmss_noc-base", "system_noc-base", "ipa_virt-base";



		mbox-names = "apps_rsc", "disp_rsc";

		mboxes = <&apps_rsc 0 &disp_rsc 0>;
@@ -397,6 +398,15 @@ 
			clocks = <>;

		};



		fab_ipa_virt: fab-ipa_virt {

			cell-id = <MSM_BUS_FAB_IPA_VIRT>;

			label = "fab-ipa_virt";

			qcom,fab-dev;

			qcom,base-name = "ipa_virt-base";

			qcom,bypass-qos-prg;

			clocks = <>;

		};



		fab_mc_virt: fab-mc_virt {

			cell-id = <MSM_BUS_FAB_MC_VIRT>;

			label = "fab-mc_virt";
@@ -590,7 +600,6 @@ 
			qcom,qport = <2>;

			qcom,connections = <&slv_qns_a2noc_snoc>;

			qcom,bus-dev = <&fab_aggre2_noc>;

			qcom,bcms = <&bcm_ip0>;

		};



		mas_xm_pcie3_1: mas-xm-pcie3-1 {
@@ -776,6 +785,15 @@ 
			qcom,bus-dev = <&fab_gladiator_noc>;

		};



		mas_ipa_core: mas-ipa-core {

			cell-id = <MSM_BUS_MASTER_IPA_CORE>;

			label = "mas-ipa-core";

			qcom,buswidth = <1>;

			qcom,agg-ports = <1>;

			qcom,connections = <&slv_ipa_core>;

			qcom,bus-dev = <&fab_ipa_virt>;

		};



		mas_llcc_mc: mas-llcc-mc {

			cell-id = <MSM_BUS_MASTER_LLCC>;

			label = "mas-llcc-mc";
@@ -1601,6 +1619,15 @@ 
			qcom,bus-dev = <&fab_gladiator_noc>;

		};



		slv_ipa_core:slv-ipa-core {

			cell-id = <MSM_BUS_SLAVE_IPA>;

			label = "slv-ipa-core";

			qcom,buswidth = <1>;

			qcom,agg-ports = <1>;

			qcom,bus-dev = <&fab_ipa_virt>;

			qcom,bcms = <&bcm_ip0>;

		};



		slv_ebi:slv-ebi {

			cell-id = <MSM_BUS_SLAVE_EBI_CH0>;

			label = "slv-ebi";

include/dt-bindings/msm/msm-bus-ids.h

+5 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#define	MSM_BUS_FAB_DC_NOC 6150

#define	MSM_BUS_FAB_MC_VIRT 6151

#define	MSM_BUS_FAB_MEM_NOC 6152

#define	MSM_BUS_FAB_IPA_VIRT 6153



#define MSM_BUS_FAB_MC_VIRT_DISPLAY 26000

#define MSM_BUS_FAB_MEM_NOC_DISPLAY 26001
@@ -241,7 +242,8 @@ 
#define	MSM_BUS_MASTER_ANOC_PCIE_SNOC 140

#define	MSM_BUS_MASTER_PIMEM 141

#define	MSM_BUS_MASTER_MEM_NOC_SNOC 142

#define	MSM_BUS_MASTER_MASTER_LAST 143

#define	MSM_BUS_MASTER_IPA_CORE 143

#define	MSM_BUS_MASTER_MASTER_LAST 144



#define MSM_BUS_MASTER_LLCC_DISPLAY 20000

#define MSM_BUS_MASTER_MNOC_HF_MEM_NOC_DISPLAY 20001
@@ -579,7 +581,8 @@ 
#define	MSM_BUS_SLAVE_SNOC_MEM_NOC_GC 774

#define	MSM_BUS_SLAVE_SNOC_MEM_NOC_SF 775

#define	MSM_BUS_SLAVE_MEM_NOC_SNOC 776

#define	MSM_BUS_SLAVE_LAST 777

#define	MSM_BUS_SLAVE_IPA 777

#define	MSM_BUS_SLAVE_LAST 778



#define	MSM_BUS_SLAVE_EBI_CH0_DISPLAY 20512

#define	MSM_BUS_SLAVE_LLCC_DISPLAY 20513