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

Commit e374892a 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 linux,contiguous-region for 8916 PIL regions"

parents e0219bca cc48ec3b
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -101,10 +101,16 @@
			linux,reserve-contiguous-region;
			linux,reserve-region;
			linux,remove-completely;
			reg = <0x0 0x8eb00000 0x0 0x0b00000>;
			reg = <0x0 0x8eb00000 0x0 0x0600000>;
			label = "peripheral_mem";
		};

		venus_mem: venus_region@0 {
			linux,reserve-contiguous-region;
			reg = <0 0x8f100000 0 0x0500000>;
			label = "venus_mem";
		};

		secure_mem: secure_region@0 {
                        linux,reserve-contiguous-region;
			reg = <0 0 0 0x6D00000>;
@@ -1490,6 +1496,7 @@
		qcom,pas-id = <9>;
		qcom,proxy-timeout-ms = <5000>;
		qcom,firmware-name = "venus";
		linux,contiguous-region = <&venus_mem>;
	};

	qcom,msm-thermal {
@@ -1570,6 +1577,7 @@

		/* GPIO output to mss */
		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_1_out 0 0>;
		linux,contiguous-region = <&modem_adsp_mem>;
	};

	qcom,vidc@1d00000 {
@@ -1665,6 +1673,7 @@

		/* GPIO output to wcnss */
		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_4_out 0 0>;
		linux,contiguous-region = <&peripheral_mem>;
	};

	cpu-pmu {