Merge e5d06bd779 on remote branch

Change-Id: I3a06c9b65ff212d47135caacdc0e5241cc6155a0
This commit is contained in:
Linux Build Service Account
2024-03-19 15:49:42 -07:00

View File

@@ -44,10 +44,32 @@
/* Low Latency pipe alloc factor */ /* Low Latency pipe alloc factor */
qcom,ipa-gen-rx-ll-pool-sz-factor = <1>; qcom,ipa-gen-rx-ll-pool-sz-factor = <1>;
#address-cells = <2>;
#size-cells = <2>;
};
&soc {
ipa_smmu_ap_partition: ipa_smmu_ap_partition {
iommu-addresses = <&ipa_smmu_ap 0x0 0x0 0x0 0x20000000>,
<&ipa_smmu_ap 0x0 0x40000000 0xFFFFFFFF 0xC0000000>;
};
ipa_smmu_uc_partition: ipa_smmu_uc_partition {
iommu-addresses = <&ipa_smmu_uc 0x0 0x0 0x0 0x20000000>,
<&ipa_smmu_uc 0x0 0x40000000 0xFFFFFFFF 0xC0000000>;
};
}; };
&ipa_smmu_ap { &ipa_smmu_ap {
/delete-property/ qcom,iommu-dma-addr-pool;
memory-region = <&ipa_smmu_ap_partition>;
qcom,additional-mapping = qcom,additional-mapping =
/* modem tables in IMEM */ /* modem tables in IMEM */
<0x14683000 0x14683000 0x2000>; <0x14683000 0x14683000 0x2000>;
qcom,ipa-q6-smem-size = <55296>;
};
&ipa_smmu_uc {
/delete-property/ qcom,iommu-dma-addr-pool;
memory-region = <&ipa_smmu_uc_partition>;
}; };