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

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

Merge "ion: msm_ion: Add support for new Qseecom_ta ion heap for msm-4.14"

parents 8d1b9eb9 95ceaac4

drivers/staging/android/ion/ion.h

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#define ION_MM_HEAP_NAME	"mm"

#define ION_SPSS_HEAP_NAME	"spss"

#define ION_QSECOM_HEAP_NAME	"qsecom"

#define ION_QSECOM_TA_HEAP_NAME	"qsecom_ta"

#define ION_SECURE_HEAP_NAME	"secure_heap"

#define ION_SECURE_DISPLAY_HEAP_NAME "secure_display"

#define ION_AUDIO_HEAP_NAME    "audio"

drivers/staging/android/ion/msm/msm_ion_of.c

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ static struct ion_heap_desc ion_heap_meta[] = { 
		.id	= ION_QSECOM_HEAP_ID,

		.name	= ION_QSECOM_HEAP_NAME,

	},

	{

		.id	= ION_QSECOM_TA_HEAP_ID,

		.name	= ION_QSECOM_TA_HEAP_NAME,

	},

	{

		.id	= ION_SPSS_HEAP_ID,

		.name	= ION_SPSS_HEAP_NAME,

drivers/staging/android/uapi/msm_ion.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ enum ion_heap_ids { 
 * Newly added heap ids have to be #define(d) since all API changes must

 * include a new #define.

 */

#define ION_QSECOM_TA_HEAP_ID		19

#define ION_AUDIO_HEAP_ID		28



/**