Merge "ARM: dts: msm: Add linux,contiguous-region for 8x26 PIL regions" (cf59ccde) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/boot/dts/qcom/msm8226-w-memory.dtsi

+11 −0

Original line number	Diff line number	Diff line
		@@ -61,3 +61,14 @@
		};
		};

		&modem_pil {
		/delete-property/ linux,contiguous-region;
		};

		&venus_pil {
		/delete-property/ linux,contiguous-region;
		};

		&lpass_pil {
		linux,contiguous-region = <&adsp_pil_mem>;
		};

+7 −3

Original line number	Diff line number	Diff line
		@@ -1066,7 +1066,7 @@
		};
		};

		qcom,venus@fdce0000 {
		venus_pil: qcom,venus@fdce0000 {
		compatible = "qcom,pil-tz-generic";
		reg = <0xfdce0000 0x4000>;

		@@ -1087,6 +1087,7 @@
		qcom,pas-id = <9>;
		qcom,proxy-timeout-ms = <5000>;
		qcom,firmware-name = "venus";
		linux,contiguous-region = <&adsp_venus_mem>;
		};

		qcom,pronto@fb21b000 {
		@@ -1113,13 +1114,14 @@

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

		qcom,iris-fm {
		compatible = "qcom,iris_fm";
		};

		qcom,lpass@fe200000 {
		lpass_pil: qcom,lpass@fe200000 {
		compatible = "qcom,pil-tz-generic";
		reg = <0xfe200000 0x00100>;
		interrupts = <0 162 1>;
		@@ -1144,9 +1146,10 @@

		/* GPIO output to lpass */
		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_2_out 0 0>;
		linux,contiguous-region = <&adsp_venus_mem>;
		};

		qcom,mss@fc880000 {
		modem_pil: qcom,mss@fc880000 {
		compatible = "qcom,pil-q6v5-mss";
		reg = <0xfc880000 0x100>,
		<0xfd485000 0x400>,
		@@ -1175,6 +1178,7 @@

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

		tsens: tsens@fc4a8000 {

+16 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,22 @@
		<54 111>,
		<55 113>;
		};

		qcom,lpass@fe200000 {
		linux,contiguous-region = <&adsp_venus_mem>;
		};

		qcom,mss@fc880000 {
		linux,contiguous-region = <&modem_mem>;
		};

		qcom,venus@fdce0000 {
		linux,contiguous-region = <&adsp_venus_mem>;
		};

		qcom,pronto@fb21b000 {
		linux,contiguous-region = <&alt_peripheral_mem>;
		};
		};

		&tlmm_pinmux {