Merge e7efed391d
on remote branch
Change-Id: If966790c1dcfddbce46c8c4f8217c0f51fa6f825
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Sun SOC";
|
||||
compatible = "qcom,sun";
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>;
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>,
|
||||
<0x100026a 0x10000>, <0x100026a 0x20000>;
|
||||
qcom,board-id = <0 0>;
|
||||
};
|
||||
|
23
sun-ipa.dtsi
23
sun-ipa.dtsi
@@ -25,7 +25,7 @@
|
||||
|
||||
/* SVS2 */
|
||||
qcom,svs2 =
|
||||
<600000 0 600000 1300000 0 76800>;
|
||||
<0 0 0 1300000 0 76800>;
|
||||
|
||||
/* SVS */
|
||||
qcom,svs =
|
||||
@@ -44,32 +44,11 @@
|
||||
|
||||
/* Low Latency pipe alloc factor */
|
||||
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 {
|
||||
/delete-property/ qcom,iommu-dma-addr-pool;
|
||||
memory-region = <&ipa_smmu_ap_partition>;
|
||||
qcom,additional-mapping =
|
||||
/* modem tables in IMEM */
|
||||
<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>;
|
||||
};
|
||||
|
Reference in New Issue
Block a user