samsung_sm8750/android_kernel_samsung_sm8750-devicetrees
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ARM: dts: msm: Update qup_iommu_region"

Browse Source
This commit is contained in:
QCTECMDR Service
2024-11-13 05:31:11 -08:00
committed by Gerrit - the friendly Code Review server
parent 7ff92e488d f5dc7ce0a9
commit d9e3445780
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
qcom/parrot-qupv3.dtsi
View File

@@ -19,11 +19,9 @@
* Qup1 5: SE 11
*/
qup_iommu_region: qup_iommu_region {
qup_iommu_region0: 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>;
<&qupv3_0 0x0 0x40000000>, <&qupv3_0 0x50000000 0xb0000000>;
};
/* GPI Instance */
@@ -48,7 +46,7 @@
<GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>;
qcom,gpii-mask = <0x3f>;
qcom,ev-factor = <2>;
memory-region = <&qup_iommu_region>;
memory-region = <&qup_iommu_region0>;
dma-coherent;
qcom,gpi-ee-offset = <0x10000>;
status = "ok";
@@ -64,7 +62,7 @@
clocks = <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>,
<&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>;
iommus = <&apps_smmu 0x163 0x0>;
memory-region = <&qup_iommu_region>;
memory-region = <&qup_iommu_region0>;
qcom,iommu-geometry = <0x40000000 0x10000000>;
qcom,iommu-dma = "fastmap";
dma-coherent;
@@ -327,6 +325,10 @@
};
};
qup_iommu_region1: qup_iommu_region {
iommu-addresses = <&gpi_dma1 0x0 0x100000>, <&gpi_dma1 0x200000 0xffe00000>,
<&qupv3_1 0x0 0x40000000>, <&qupv3_1 0x50000000 0xb0000000>;
};
/* GPI Instance */
gpi_dma1: qcom,gpi-dma@a00000 {
compatible = "qcom,gpi-dma";
@@ -350,7 +352,7 @@
qcom,static-gpii-mask = <0x1>;
qcom,gpii-mask = <0x3e>;
qcom,ev-factor = <2>;
memory-region = <&qup_iommu_region>;
memory-region = <&qup_iommu_region1>;
dma-coherent;
qcom,gpi-ee-offset = <0x10000>;
status = "ok";
@@ -366,7 +368,7 @@
clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
<&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
iommus = <&apps_smmu 0x403 0x0>;
memory-region = <&qup_iommu_region>;
memory-region = <&qup_iommu_region1>;
qcom,iommu-geometry = <0x40000000 0x10000000>;
qcom,iommu-dma = "fastmap";
dma-coherent;

19
qcom/ravelin-qupv3.dtsi
View File

@@ -17,11 +17,9 @@
* Qup1 4: SE 9
*/
qup_iommu_region: qup_iommu_region {
qup_iommu_region0: 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>;
<&qupv3_0 0x0 0x40000000>, <&qupv3_0 0x50000000 0xb0000000>;
};
/* GPI Instance */
@@ -47,7 +45,7 @@
qcom,static-gpii-mask = <0x1>;
qcom,gpii-mask = <0x3e>;
qcom,ev-factor = <2>;
memory-region = <&qup_iommu_region>;
memory-region = <&qup_iommu_region0>;
dma-coherent;
qcom,gpi-ee-offset = <0x10000>;
status = "ok";
@@ -63,7 +61,7 @@
clocks = <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>,
<&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>;
iommus = <&apps_smmu 0x163 0x0>;
memory-region = <&qup_iommu_region>;
memory-region = <&qup_iommu_region0>;
qcom,iommu-geometry = <0x40000000 0x10000000>;
qcom,iommu-dma = "fastmap";
dma-coherent;
@@ -281,6 +279,11 @@
};
};
qup_iommu_region1: qup_iommu_region {
iommu-addresses = <&gpi_dma1 0x0 0x100000>, <&gpi_dma1 0x200000 0xffe00000>,
<&qupv3_1 0x0 0x40000000>, <&qupv3_1 0x50000000 0xb0000000>;
};
/* GPI Instance */
gpi_dma1: qcom,gpi-dma@a00000 {
compatible = "qcom,gpi-dma";
@@ -303,7 +306,7 @@
<GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;
qcom,gpii-mask = <0x3f>;
qcom,ev-factor = <2>;
memory-region = <&qup_iommu_region>;
memory-region = <&qup_iommu_region1>;
dma-coherent;
qcom,gpi-ee-offset = <0x10000>;
status = "ok";
@@ -319,7 +322,7 @@
clocks = <&gcc GCC_QUPV3_WRAP_1_M_AHB_CLK>,
<&gcc GCC_QUPV3_WRAP_1_S_AHB_CLK>;
iommus = <&apps_smmu 0x403 0x0>;
memory-region = <&qup_iommu_region>;
memory-region = <&qup_iommu_region1>;
qcom,iommu-geometry = <0x40000000 0x10000000>;
qcom,iommu-dma = "fastmap";
dma-coherent;