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

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

Merge "ARM: dts: msm: set dma mapping mode to atomic"

parents a4bada92 ed40237f

qcom/sa6155p-vm.dtsi

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

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

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

	qcom,iommu-dma = "atomic";

};



&qupv3_1 {

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

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

	qcom,iommu-dma = "atomic";

};

qcom/sa8155-vm.dtsi

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

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

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

	qcom,iommu-dma = "atomic";

};



&qupv3_1 {

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

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

	qcom,iommu-dma = "atomic";

};



&qupv3_2 {

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

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

	qcom,iommu-dma = "atomic";

};



&qupv3_3 {

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

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

	qcom,iommu-dma = "atomic";

};



&pcie_rc0 {

qcom/sa8195-vm.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -893,19 +893,23 @@ 
&qupv3_0 {

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

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

	qcom,iommu-dma = "atomic";

};



&qupv3_1 {

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

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

	qcom,iommu-dma = "atomic";

};



&qupv3_2 {

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

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

	qcom,iommu-dma = "atomic";

};



&qupv3_3 {

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

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

	qcom,iommu-dma = "atomic";

};