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

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

Merge "ARM: dts: msm: Rectify DT flags and GPII mask for TUI VM usecase"

parents 669c7368 34ec1d07

qcom/yupik-qupv3.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ 
			<GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>,

			<GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;

		qcom,static-gpii-mask = <0x1>;

		qcom,gpii-mask = <0x3f>;

		qcom,gpii-mask = <0x1e>;

		qcom,ev-factor = <2>;

		qcom,iommu-dma-addr-pool = <0x100000 0x100000>;

		qcom,gpi-ee-offset = <0x10000>;

qcom/yupik-vm.dtsi

+6 −5
Original line number Diff line number Diff line
@@ -251,10 +251,11 @@ 
			<GIC_SPI 296 IRQ_TYPE_LEVEL_HIGH>,

			<GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>,

			<GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;

		qcom,gpii-mask = <0x80>;

		qcom,gpii-mask = <0x20>;

		qcom,ev-factor = <2>;

		qcom,iommu-dma-addr-pool = <0x100000 0x100000>;

		qcom,gpi-ee-offset = <0x10000>;

		qcom,le-vm;

		status = "ok";

	};
@@ -263,8 +264,8 @@ 
		reg = <0xa94000 0x4000>;

		#address-cells = <1>;

		#size-cells = <0>;

		dmas = <&gpi_dma1 0 5 3 64 2>,

			<&gpi_dma1 1 5 3 64 2>;

		dmas = <&gpi_dma1 0 5 3 64 0>,

			<&gpi_dma1 1 5 3 64 0>;

		dma-names = "tx", "rx";

		qcom,wrapper-core = <&qupv3_1>;

		qcom,le-vm;
@@ -277,8 +278,8 @@ 
		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "se_phys";

		dmas = <&gpi_dma1 0 5 1 64 2>,

			<&gpi_dma1 1 5 1 64 2>;

		dmas = <&gpi_dma1 0 5 1 64 0>,

			<&gpi_dma1 1 5 1 64 0>;

		dma-names = "tx", "rx";

		spi-max-frequency = <50000000>;

		qcom,wrapper-core = <&qupv3_1>;