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

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

Merge "ARM: dts: msm: Add reserve memory for aDSP camera for msm8953"

parents 25c75bd7 db26e514
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -328,6 +328,12 @@
		max-clk-turbo = <465000000>;
	};

	qcom,adsp {
		status = "ok";
		compatible = "adsp-shmem-device";
		memory-region = <&adsp_shmem_device_mem>;
	};

	qcom,vfe {
		compatible = "qcom,vfe";
		num_child = <2>;
+5 −0
Original line number Diff line number Diff line
@@ -136,6 +136,11 @@
			label = "cont_splash_mem";
		};

		adsp_shmem_device_mem: adsp_shmem_device_region@0xc0100000 {
			reg = <0x0 0xc0100000 0x0 0x1f400000>;
			label = "adsp_shmem_device_mem";
		};

		gpu_mem: gpu_region@0 {
			compatible = "shared-dma-pool";
			reusable;