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

Commit 29702baa authored by Laura Abbott's avatar Laura Abbott
Browse files

ARM: dts: msm: Migrate 8610 memory regions to CMA 



CMA now fully supports removing regions from memory. Since CMA
is the preferred method for tracking these regions as well, migrate
all removed regions over to use CMA and CMA derivatives.

Change-Id: I122a0fd61a57a5c6c20cac6df85daa81390aebe5
Signed-off-by: default avatarLaura Abbott <lauraa@codeaurora.org>
parent fb9d9422

arch/arm/boot/dts/qcom/msm8610-ion.dtsi

+5 −7
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -36,17 +36,15 @@ 
		qcom,ion-heap@23 { /* OTHER PIL HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <23>;

			qcom,heap-align = <0x1000>;

			qcom,memory-fixed = <0x0c500000 0x1300000>;

			qcom,ion-heap-type = "CARVEOUT";

			linux,contiguous-region = <&peripheral_mem>;

			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@26 { /* MODEM HEAP */

			compatible = "qcom,msm-ion-reserve";

			reg = <26>;

			qcom,heap-align = <0x1000>;

			qcom,memory-fixed = <0x08800000 0x3d00000>;

			qcom,ion-heap-type = "CARVEOUT";

			linux,contiguous-region = <&modem_mem>;

			qcom,ion-heap-type = "DMA";

		};



	};

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

+24 −5
Original line number Diff line number Diff line
@@ -31,6 +31,30 @@ 
			reg = <0 0x100000>;

			label = "qsecom_mem";

		};



		modem_mem: qsecom_region@8800000 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			reg = <0x8800000 0x3d00000>;

			label = "modem_mem";

		};



		peripheral_mem: peripheral_region@c500000 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			reg = <0x0c500000 0x1300000>;

			label = "peripheral_mem";

		};



		external_image_mem: external_image_region@d800000 {

			linux,reserve-contiguous-region;

			linux,reserve-region;

			linux,remove-completely;

			reg = <0x0d800000 0x600000>;

			label = "external_image_mem";

		};

	};



	aliases {
@@ -523,11 +547,6 @@ 
		compatible = "qcom,bcl";

	};



	qcom,msm-mem-hole {

		compatible = "qcom,msm-mem-hole";

		qcom,memblock-remove = <0x08800000 0x5600000>; /* Address and Size of Hole */

	};



	qcom,wdt@f9017000 {

		compatible = "qcom,msm-watchdog";

		reg = <0xf9017000 0x1000>;