Merge "ARM: dts: msm: enable more SIDs"

This commit is contained in:
qctecmdr 2021-01-14 06:21:52 -08:00 • committed by Gerrit - the friendly Code Review server
commit 683c7dabea
2 changed files with 23 additions and 4 deletions

View file

@ -46,6 +46,12 @@ Optional:
compatible "qcom,ipa-smmu-uc-cb"
- ipa_smmu_11ad: 11AD SMMU device
compatible "qcom,ipa-smmu-11ad-cb"
- ipa_smmu_wlan1: WDI (PINE) SMMU device
compatible "qcom,ipa-smmu-wlan1-cb"
- ipa_smmu_eth: ETH (AQC/RTK/NTN) SMMU device
compatible "qcom,ipa-smmu-eth-cb"
- ipa_smmu_eth1: ETH1 (WAN/CV2X) SMMU device
compatible "qcom,ipa-smmu-eth1-cb"
- qcom,use-a2-service: determine if A2 service will be used
- qcom,use-ipa-tethering-bridge: determine if tethering bridge will be used
- qcom,use-ipa-in-mhi-mode: Boolean context flag to indicate whether
@ -127,6 +133,7 @@ memory allocation over a PCIe bridge
2 (override scm call as though it returned false)
- qcom,ipa-gpi-event-rp-ddr: Boolean context flag to control whether GPI and GCI event
rings read pointer should be read from the ddr.
- qcom,max_num_smmu_cb: number of active smmu context banks for target.
IPA pipe sub nodes (A2 static pipes configurations):

View file

@ -1087,6 +1087,7 @@
clocks = <&rpmhcc RPMH_IPA_CLK>;
qcom,interconnect,num-cases = <5>;
qcom,interconnect,num-paths = <4>;
qcom,max_num_smmu_cb = <6>;
interconnects = <&system_noc MASTER_IPA &mem_noc SLAVE_LLCC>,
<&mc_virt MASTER_LLCC &mc_virt SLAVE_EBI1>,
<&system_noc MASTER_IPA &system_noc SLAVE_IMEM>,
@ -1142,11 +1143,22 @@
qcom,iommu-dma = "atomic";
};
ipa_smmu_11ad: ipa_smmu_11ad {
compatible = "qcom,ipa-smmu-11ad-cb";
ipa_smmu_eth: ipa_smmu_eth {
compatible = "qcom,ipa-smmu-eth-cb";
iommus = <&apps_smmu 0x5E3 0x0>;
qcom,shared-cb;
qcom,iommu-group = <>;
qcom,iommu-dma = "atomic";
};
ipa_smmu_eth1: ipa_smmu_eth1 {
compatible = "qcom,ipa-smmu-eth1-cb";
iommus = <&apps_smmu 0x5E4 0x0>;
qcom,iommu-dma = "atomic";
};
ipa_smmu_wlan1: ipa_smmu_wlan1 {
compatible = "qcom,ipa-smmu-wlan1-cb";
iommus = <&apps_smmu 0x5E5 0x0>;
qcom,iommu-dma = "atomic";
};
/* smp2p information */