Merge "ARM: dts: msm: Remove address from node-name for reserved-mem regions" (59733bcc) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sm8150.dtsi

+20 −20

Original line number	Diff line number	Diff line
		@@ -595,116 +595,116 @@
		#size-cells = <2>;
		ranges;

		hyp_mem: hyp_mem@85700000 {
		hyp_mem: hyp_mem {
		no-map;
		reg = <0x0 0x85700000 0x0 0x600000>;
		};

		xbl_aop_mem: xbl_aop_mem@85e00000 {
		xbl_aop_mem: xbl_aop_mem {
		no-map;
		reg = <0x0 0x85e00000 0x0 0x140000>;
		};

		smem_region: smem@86000000 {
		smem_region: smem {
		no-map;
		reg = <0x0 0x86000000 0x0 0x200000>;
		};

		removed_regions: removed_regions@86200000 {
		removed_regions: removed_regions {
		no-map;
		reg = <0x0 0x86200000 0x0 0x5500000>;
		};

		pil_camera_mem: camera_region@8b700000 {
		pil_camera_mem: camera_region {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8b700000 0x0 0x500000>;
		};

		pil_wlan_fw_mem: pil_wlan_fw_region@8bc00000 {
		pil_wlan_fw_mem: pil_wlan_fw_region {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8bc00000 0x0 0x180000>;
		};

		pil_npu_mem: pil_npu_region@8bd80000 {
		pil_npu_mem: pil_npu_region {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8bd80000 0x0 0x80000>;
		};

		pil_adsp_mem: pil_adsp_region@8be00000 {
		pil_adsp_mem: pil_adsp_region {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8be00000 0x0 0x1a00000>;
		};

		pil_modem_mem: modem_region@8d800000 {
		pil_modem_mem: modem_region {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x8d800000 0x0 0x9600000>;
		};

		pil_video_mem: pil_video_region@96e00000 {
		pil_video_mem: pil_video_region {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x96e00000 0x0 0x500000>;
		};

		pil_slpi_mem: pil_slpi_region@97300000 {
		pil_slpi_mem: pil_slpi_region {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x97300000 0x0 0x1400000>;
		};

		pil_ipa_fw_mem: pil_ipa_fw_region@98700000 {
		pil_ipa_fw_mem: pil_ipa_fw_region {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x98700000 0x0 0x10000>;
		};

		pil_ipa_gsi_mem: pil_ipa_gsi_region@98710000 {
		pil_ipa_gsi_mem: pil_ipa_gsi_region {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x98710000 0x0 0x5000>;
		};

		pil_gpu_mem: pil_gpu_region@98715000 {
		pil_gpu_mem: pil_gpu_region {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x98715000 0x0 0x2000>;
		};

		pil_spss_mem: pil_spss_region@98800000 {
		pil_spss_mem: pil_spss_region {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x98800000 0x0 0x100000>;
		};

		pil_cdsp_mem: cdsp_regions@98900000 {
		pil_cdsp_mem: cdsp_regions {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0x98900000 0x0 0x1400000>;
		};

		qseecom_mem: qseecom_region@0x9e400000 {
		qseecom_mem: qseecom_region {
		compatible = "shared-dma-pool";
		no-map;
		reg = <0 0x9e400000 0 0x1400000>;
		};

		cdsp_sec_mem: cdsp_sec_regions@0xa4c00000 {
		cdsp_sec_mem: cdsp_sec_regions {
		compatible = "removed-dma-pool";
		no-map;
		reg = <0x0 0xa4c00000 0x0 0x3c00000>;
		};

		cont_splash_memory: cont_splash_region@9c000000 {
		cont_splash_memory: cont_splash_region {
		reg = <0x0 0x9c000000 0x0 0x02400000>;
		label = "cont_splash_region";
		};

		disp_rdump_memory: disp_rdump_region@9c000000 {
		disp_rdump_memory: disp_rdump_region {
		reg = <0x0 0x9c000000 0x0 0x02400000>;
		label = "disp_rdump_region";
		};