Merge "ARM: dts: msm: Use "iommu-addresses" property for ravelin qup"
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
169dcdc551
@@ -17,6 +17,13 @@
|
|||||||
* Qup1 4: SE 9
|
* Qup1 4: SE 9
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
qup_iommu_region: qup_iommu_region {
|
||||||
|
iommu-addresses = <&gpi_dma0 0x0 0x100000>, <&gpi_dma0 0x200000 0xffe00000>,
|
||||||
|
<&qupv3_0 0x0 0x40000000>, <&qupv3_0 0x50000000 0xb0000000>,
|
||||||
|
<&gpi_dma1 0x0 0x100000>, <&gpi_dma1 0x200000 0xffe00000>,
|
||||||
|
<&qupv3_1 0x0 0x40000000>, <&qupv3_1 0x50000000 0xb0000000>;
|
||||||
|
};
|
||||||
|
|
||||||
/* GPI Instance */
|
/* GPI Instance */
|
||||||
gpi_dma0: qcom,gpi-dma@900000 {
|
gpi_dma0: qcom,gpi-dma@900000 {
|
||||||
compatible = "qcom,gpi-dma";
|
compatible = "qcom,gpi-dma";
|
||||||
@@ -40,7 +47,7 @@
|
|||||||
qcom,static-gpii-mask = <0x1>;
|
qcom,static-gpii-mask = <0x1>;
|
||||||
qcom,gpii-mask = <0x3e>;
|
qcom,gpii-mask = <0x3e>;
|
||||||
qcom,ev-factor = <2>;
|
qcom,ev-factor = <2>;
|
||||||
qcom,iommu-dma-addr-pool = <0x100000 0x100000>;
|
memory-region = <&qup_iommu_region>;
|
||||||
dma-coherent;
|
dma-coherent;
|
||||||
qcom,gpi-ee-offset = <0x10000>;
|
qcom,gpi-ee-offset = <0x10000>;
|
||||||
status = "ok";
|
status = "ok";
|
||||||
@@ -56,7 +63,7 @@
|
|||||||
clocks = <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>,
|
clocks = <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>,
|
||||||
<&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>;
|
<&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>;
|
||||||
iommus = <&apps_smmu 0x163 0x0>;
|
iommus = <&apps_smmu 0x163 0x0>;
|
||||||
qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
|
memory-region = <&qup_iommu_region>;
|
||||||
qcom,iommu-geometry = <0x40000000 0x10000000>;
|
qcom,iommu-geometry = <0x40000000 0x10000000>;
|
||||||
qcom,iommu-dma = "fastmap";
|
qcom,iommu-dma = "fastmap";
|
||||||
dma-coherent;
|
dma-coherent;
|
||||||
@@ -294,7 +301,7 @@
|
|||||||
<GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;
|
<GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
qcom,gpii-mask = <0x3f>;
|
qcom,gpii-mask = <0x3f>;
|
||||||
qcom,ev-factor = <2>;
|
qcom,ev-factor = <2>;
|
||||||
qcom,iommu-dma-addr-pool = <0x100000 0x100000>;
|
memory-region = <&qup_iommu_region>;
|
||||||
dma-coherent;
|
dma-coherent;
|
||||||
qcom,gpi-ee-offset = <0x10000>;
|
qcom,gpi-ee-offset = <0x10000>;
|
||||||
status = "ok";
|
status = "ok";
|
||||||
@@ -310,7 +317,7 @@
|
|||||||
clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
|
clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
|
||||||
<&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
|
<&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
|
||||||
iommus = <&apps_smmu 0x403 0x0>;
|
iommus = <&apps_smmu 0x403 0x0>;
|
||||||
qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
|
memory-region = <&qup_iommu_region>;
|
||||||
qcom,iommu-geometry = <0x40000000 0x10000000>;
|
qcom,iommu-geometry = <0x40000000 0x10000000>;
|
||||||
qcom,iommu-dma = "fastmap";
|
qcom,iommu-dma = "fastmap";
|
||||||
dma-coherent;
|
dma-coherent;
|
||||||
|
Reference in New Issue
Block a user