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

Commit d66a43ec authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I20100c8e,I656898aa into msm-next 

* changes:
  defconfig: sdm855: Enable MSM ION
  ARM: dts: msm: Add ion heaps for sdm855
parents f31ee6b1 0f9c4c11

arch/arm64/boot/dts/qcom/sdm855-ion.dtsi

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&soc {

	qcom,ion {

		compatible = "qcom,msm-ion";

		#address-cells = <1>;

		#size-cells = <0>;



		system_heap: qcom,ion-heap@25 {

			reg = <25>;

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

		};



		qcom,ion-heap@22 { /* ADSP HEAP */

			reg = <22>;

			memory-region = <&adsp_mem>;

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

		};



		qcom,ion-heap@27 { /* QSEECOM HEAP */

			reg = <27>;

			memory-region = <&qseecom_mem>;

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

		};



		qcom,ion-heap@13 { /* SPSS HEAP */

			reg = <13>;

			memory-region = <&sp_mem>;

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

		};



		qcom,ion-heap@10 { /* SECURE DISPLAY HEAP */

			reg = <10>;

			memory-region = <&secure_display_memory>;

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

		};



		qcom,ion-heap@9 {

			reg = <9>;

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

		};

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -622,3 +622,4 @@ 
};

#include "sdm855-pinctrl.dtsi"

#include "sdm855-regulator.dtsi"

#include "sdm855-ion.dtsi"

arch/arm64/configs/sdm855-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -297,6 +297,8 @@ CONFIG_DMADEVICES=y 
CONFIG_UIO=y

CONFIG_STAGING=y

CONFIG_ASHMEM=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_SCM=y

CONFIG_EXTCON=y

arch/arm64/configs/sdm855_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -303,6 +303,8 @@ CONFIG_DMADEVICES=y 
CONFIG_UIO=y

CONFIG_STAGING=y

CONFIG_ASHMEM=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_SCM=y

CONFIG_EXTCON=y