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

Commit 5a1d6cf6 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: split adsp and wcnss f/w region for msm89{17,37,40,53}"

parents 1318efd9 5d921191

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

+10 −4
Original line number Diff line number Diff line
@@ -64,10 +64,16 @@ 
			reg = <0x0 0x86800000 0x0 0x5000000>;

		};



		reloc_mem: reloc_region@0 {

		adsp_fw_mem: adsp_fw_region@0 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x8b800000 0x0 0x1800000>;

			reg = <0x0 0x8b800000 0x0 0x1100000>;

		};



		wcnss_fw_mem: wcnss_fw_region@0 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x8c900000 0x0 0x700000>;

		};



		venus_mem: venus_region@0 {
@@ -1589,7 +1595,7 @@ 
		/* GPIO output to lpass */

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



		memory-region = <&reloc_mem>;

		memory-region = <&adsp_fw_mem>;

	};



	qcom,pronto@a21b000 {
@@ -1627,7 +1633,7 @@ 


		/* GPIO output to wcnss */

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

		memory-region = <&reloc_mem>;

		memory-region = <&wcnss_fw_mem>;

	};



	qcom,venus@1de0000 {

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

+11 −4
Original line number Diff line number Diff line
@@ -42,12 +42,19 @@ 
			reg = <0x0 0x86800000 0x0 0x5000000>;

		};



		reloc_mem: reloc_region@0 {

		adsp_fw_mem: adsp_fw_region@0 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x8b800000 0x0 0x1800000>;

			reg = <0x0 0x8b800000 0x0 0x1100000>;

		};



		wcnss_fw_mem: wcnss_fw_region@0 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x8c900000 0x0 0x700000>;

		};





		venus_mem: venus_region@0 {

			compatible = "shared-dma-pool";

			reusable;
@@ -1847,7 +1854,7 @@ 
		/* GPIO output to lpass */

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



		memory-region = <&reloc_mem>;

		memory-region = <&adsp_fw_mem>;

	};



	qcom,pronto@a21b000 {
@@ -1885,7 +1892,7 @@ 


		/* GPIO output to wcnss */

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

		memory-region = <&reloc_mem>;

		memory-region = <&wcnss_fw_mem>;

	};



	qcom,venus@1de0000 {

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

+6 −2
Original line number Diff line number Diff line
@@ -261,8 +261,12 @@ 
	reg = <0x0 0x86800000 0x0 0x6a00000>;

};



&reloc_mem {

	reg = <0x0 0x8d200000 0x0 0x1800000>;

&adsp_fw_mem {

	reg = <0x0 0x8d200000 0x0 0x1100000>;

};



&wcnss_fw_mem {

	reg = <0x0 0x8e300000 0x0 0x700000>;

};



&funnel_apss {

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

+10 −4
Original line number Diff line number Diff line
@@ -43,10 +43,16 @@ 
			reg = <0x0 0x86c00000 0x0 0x6a00000>;

		};



		reloc_mem: reloc_region@0 {

		adsp_fw_mem: adsp_fw_region@0 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x8d600000 0x0 0x1800000>;

			reg = <0x0 0x8d600000 0x0 0x1100000>;

		};



		wcnss_fw_mem: wcnss_fw_region@0 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x8e700000 0x0 0x700000>;

		};



		venus_mem: venus_region@0 {
@@ -1901,7 +1907,7 @@ 
		/* GPIO output to lpass */

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



		memory-region = <&reloc_mem>;

		memory-region = <&adsp_fw_mem>;

	};



	qcom,venus@1de0000 {
@@ -1981,7 +1987,7 @@ 


		/* GPIO output to wcnss */

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

		memory-region = <&reloc_mem>;

		memory-region = <&wcnss_fw_mem>;

	};



	usb3: ssusb@7000000{