Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a806c001 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: bypass S1 dma mappings in Linux guest"

parents 375be9aa 9a86c181

qcom/sa6155p-vm.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -436,12 +436,12 @@ 
&qupv3_0 {

	/delete-property/ qcom,msm-bus,num-paths;

	/delete-property/ qcom,msm-bus,vectors-bus-ids;

	qcom,iommu-dma = "atomic";

	qcom,iommu-dma = "bypass";

};



&qupv3_1 {

	/delete-property/ qcom,msm-bus,num-paths;

	/delete-property/ qcom,msm-bus,vectors-bus-ids;

	qcom,iommu-dma = "atomic";

	qcom,iommu-dma = "bypass";

};

qcom/sa8155-vm.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -862,25 +862,25 @@ 
&qupv3_0 {

	/delete-property/ qcom,msm-bus,num-paths;

	/delete-property/ qcom,msm-bus,vectors-bus-ids;

	qcom,iommu-dma = "atomic";

	qcom,iommu-dma = "bypass";

};



&qupv3_1 {

	/delete-property/ qcom,msm-bus,num-paths;

	/delete-property/ qcom,msm-bus,vectors-bus-ids;

	qcom,iommu-dma = "atomic";

	qcom,iommu-dma = "bypass";

};



&qupv3_2 {

	/delete-property/ qcom,msm-bus,num-paths;

	/delete-property/ qcom,msm-bus,vectors-bus-ids;

	qcom,iommu-dma = "atomic";

	qcom,iommu-dma = "bypass";

};



&qupv3_3 {

	/delete-property/ qcom,msm-bus,num-paths;

	/delete-property/ qcom,msm-bus,vectors-bus-ids;

	qcom,iommu-dma = "atomic";

	qcom,iommu-dma = "bypass";

};



&pcie_rc0 {

qcom/sa8195-vm.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -893,19 +893,19 @@ 
&qupv3_0 {

	/delete-property/ qcom,msm-bus,num-paths;

	/delete-property/ qcom,msm-bus,vectors-bus-ids;

	qcom,iommu-dma = "atomic";

	qcom,iommu-dma = "bypass";

};



&qupv3_1 {

	/delete-property/ qcom,msm-bus,num-paths;

	/delete-property/ qcom,msm-bus,vectors-bus-ids;

	qcom,iommu-dma = "atomic";

	qcom,iommu-dma = "bypass";

};



&qupv3_2 {

	/delete-property/ qcom,msm-bus,num-paths;

	/delete-property/ qcom,msm-bus,vectors-bus-ids;

	qcom,iommu-dma = "atomic";

	qcom,iommu-dma = "bypass";

};



&qupv3_3 {