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

Commit 7a60d826 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "gpu: ion: remove IOMMU Heap"

parents 86158861 d761f69e

Documentation/devicetree/bindings/arm/msm/msm_ion.txt

+2 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ Required properties for Ion heaps 
    - "SYSTEM_CONTIG"

    - "CARVEOUT"

    - "CHUNK"

    - "IOMMU"

    - "CP"

    - "DMA"

    - "SECURE_DMA"
@@ -45,8 +44,8 @@ Example: 
                 #address-cells = <1>;

                 #size-cells = <0>;



                 qcom,ion-heap@30 {

                         reg = <30>;

                 qcom,ion-heap@25 {

                         reg = <25>;

                         qcom,ion-heap-type = "SYSTEM";

                 };

arch/arm/boot/dts/apq8084-ion.dtsi

+2 −7
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		qcom,ion-heap@30 {

			reg = <30>;

		qcom,ion-heap@25 {

			reg = <25>;

			qcom,ion-heap-type = "SYSTEM";

		};
@@ -26,11 +26,6 @@ 
			qcom,ion-heap-type = "SYSTEM_CONTIG";

		};



		qcom,ion-heap@25 {

			reg = <25>;

			qcom,ion-heap-type = "IOMMU";

		};



		qcom,ion-heap@8 { /* CP_MM HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <8>;

arch/arm/boot/dts/fsm9900.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -305,8 +305,8 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		qcom,ion-heap@30 {

			reg = <30>;

		qcom,ion-heap@25 {

			reg = <25>;

			qcom,ion-heap-type = "SYSTEM";

		};

	};

arch/arm/boot/dts/mpq8092-ion.dtsi

+2 −7
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		qcom,ion-heap@30 {

			reg = <30>;

		qcom,ion-heap@25 {

			reg = <25>;

			qcom,ion-heap-type = "SYSTEM";

		};
@@ -26,11 +26,6 @@ 
			qcom,ion-heap-type = "SYSTEM_CONTIG";

		};



		qcom,ion-heap@25 {

			reg = <25>;

			qcom,ion-heap-type = "IOMMU";

		};



		qcom,ion-heap@23 { /* OTHER PIL HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <23>;

arch/arm/boot/dts/msm8226-ion.dtsi

+2 −7
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
		#address-cells = <1>;

		#size-cells = <0>;



		qcom,ion-heap@30 {

			reg = <30>;

		qcom,ion-heap@25 {

			reg = <25>;

			qcom,ion-heap-type = "SYSTEM";

		};
@@ -34,11 +34,6 @@ 
			qcom,ion-heap-type = "SECURE_DMA";

		};



		qcom,ion-heap@25 {

			reg = <25>;

			qcom,ion-heap-type = "IOMMU";

		};



		qcom,ion-heap@22 { /* adsp heap */

			compatible = "qcom,msm-ion-reserve";

			reg = <22>;