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

Commit f199cc04 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: Secure display ion heap support on msm8909"

parents a07e4e7c 44bc152a

arch/arm/boot/dts/qcom/msm8909-1gb-cdp.dts

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016,2018, 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
@@ -15,6 +15,7 @@ 
#include "msm8909-cdp.dtsi"

#include "msm8909-pm8909.dtsi"

#include "msm8909-pm8909-cdp.dtsi"

#include "msm8909-mtp_qseev4.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8909-PM8909 1GB CDP";

arch/arm/boot/dts/qcom/msm8909-1gb-mtp.dts

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016,2018, 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
@@ -15,6 +15,7 @@ 
#include "msm8909-mtp.dtsi"

#include "msm8909-pm8909.dtsi"

#include "msm8909-pm8909-mtp.dtsi"

#include "msm8909-mtp_qseev4.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8909-PM8909 1GB MTP";

arch/arm/boot/dts/qcom/msm8909-1gb-rcm.dts

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016,2018, 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
@@ -16,6 +16,7 @@ 
#include "msm8909-cdp.dtsi"

#include "msm8909-pm8909.dtsi"

#include "msm8909-pm8909-cdp.dtsi"

#include "msm8909-mtp_qseev4.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8909-PM8909 1GB RCM";

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

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 2016-2017, Linux Foundation. All rights reserved.

/* Copyright (c) 2014, 2016-2018, 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
@@ -11,7 +11,7 @@ 
 */



&soc {

	qcom,ion {

	ion: qcom,ion {

		compatible = "qcom,msm-ion";

		#address-cells = <1>;

		#size-cells = <0>;

arch/arm/boot/dts/qcom/msm8909-mtp_qseev4.dtsi

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, 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.

 */



&reserved_mem {

	secure_display_memory: secure_region {

		compatible = "shared-dma-pool";

		label = "secure_display_mem";

		size = <0 0x1400000>;

		reusable;

	};

};



&ion {

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

		reg = <10>;

		memory-region = <&secure_display_memory>;

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

	};

};