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

Commit bb852465 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: Migrate 8610 memory regions to CMA"

parents 95db0bbe 29702baa

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>;