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

Commit ef094ae9 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 8x74 PIL regions"

parents 839d317c 114cebf8

arch/arm/boot/dts/qcom/apq8074-v1.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -65,6 +65,22 @@ 
				<55 512 120000 1200000>,

				<55 512 393600 3936000>;

	};



	qcom,lpass@fe200000 {

		linux,contiguous-region = <&adsp_venus_mem>;

	};



	qcom,mss@fc880000 {

		linux,contiguous-region = <&alt_peripheral_mem>;

	};



	qcom,venus@fdce0000 {

		linux,contiguous-region = <&asdp_venus_mem>;

	};



	qcom,pronto@fb21b000 {

		linux,contiguous-region = <&alt_peripheral_mem>;

	};

};



&qseecom {

arch/arm/boot/dts/qcom/apq8074-v2.0-1.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -65,6 +65,23 @@ 
				<55 512 393600 3936000>;

	};



	qcom,lpass@fe200000 {

		linux,contiguous-region = <&adsp_venus_mem>;

	};



	qcom,mss@fc880000 {

		linux,contiguous-region = <&alt_peripheral_mem>;

	};



	qcom,venus@fdce0000 {

		linux,contiguous-region = <&adsp_venus_mem>;

	};



	qcom,pronto@fb21b000 {

		linux,contiguous-region = <&alt_peripheral_mem>;

	};





};



&qseecom {

arch/arm/boot/dts/qcom/apq8074-v2.2.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -69,6 +69,23 @@ 
	sound {

		compatible = "qcom,apq8074-audio-taiko";

	};



	qcom,lpass@fe200000 {

		linux,contiguous-region = <&adsp_venus_mem>;

	};



	qcom,mss@fc880000 {

		linux,contiguous-region = <&alt_peripheral_mem>;

	};



	qcom,venus@fdce0000 {

		linux,contiguous-region = <&adsp_venus_mem>;

	};



	qcom,pronto@fb21b000 {

		linux,contiguous-region = <&alt_peripheral_mem>;

	};



};



&qseecom {

arch/arm/boot/dts/qcom/msm8974.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -1645,6 +1645,7 @@ 


		/* GPIO output to lpass */

		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_2_out 0 0>;

		linux,contiguous-region = <&peripheral_mem>;

	};



	qcom,msm-adsp-loader {
@@ -1917,6 +1918,7 @@ 


		/* GPIO output to mss */

		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_1_out 0 0>;

		linux,contiguous-region = <&peripheral_mem>;

	};



	qcom,pronto@fb21b000 {
@@ -1943,6 +1945,7 @@ 


		/* GPIO output to wcnss */

		qcom,gpio-force-stop = <&smp2pgpio_ssr_smp2p_4_out 0 0>;

		linux,contiguous-region = <&peripheral_mem>;

	};



	qcom,iris-fm {
@@ -2099,6 +2102,7 @@ 
		qcom,pas-id = <9>;

		qcom,proxy-timeout-ms = <5000>;

		qcom,firmware-name = "venus";

		linux,contiguous-region = <&peripheral_mem>;

	};



	qcom,cache_erp@f9012000 {

arch/arm/boot/dts/qcom/msm8974pro.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -1646,6 +1646,22 @@ 
	qcom,mmsscc@fd8c0000 {

		compatible = "qcom,mmsscc-8974pro";

	};



	qcom,lpass@fe200000 {

		linux,contiguous-region = <&alt_peripheral_mem>;

	};



	qcom,mss@fc880000 {

		linux,contiguous-region = <&modem_mem>;

	};



	qcom,venus@fdce0000 {

		linux,contiguous-region = <&alt_peripheral_mem>;

	};



	qcom,pronto@fb21b000 {

		linux,contiguous-region = <&alt_peripheral_mem>;

	};

};



/* GPU overrides */