summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-06 13:21:58 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-06 13:21:57 -0700
commitccde34ffb3f4e58f6885a6489c7e2eaeb7eca5e9 (patch)
treed82e17d6f8b8744bd9761c724a8925e8a1c8f145
parentf96ac4e0948fed09f9c022856495f2b352306af7 (diff)
parent5b99a712e5024a3ae2e49591748168bb3a49a68a (diff)
Merge "spcom: move SPCOM_MAX_CHANNELS define to uapi/linux/spcom.h"
-rw-r--r--drivers/soc/qcom/spcom.c2
-rw-r--r--include/uapi/linux/spcom.h8
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/soc/qcom/spcom.c b/drivers/soc/qcom/spcom.c
index d1f300e6afb7..7f03aabf415e 100644
--- a/drivers/soc/qcom/spcom.c
+++ b/drivers/soc/qcom/spcom.c
@@ -96,8 +96,6 @@
/* SPCOM driver name */
#define DEVICE_NAME "spcom"
-#define SPCOM_MAX_CHANNELS 0x20
-
/* maximum ION buffers should be >= SPCOM_MAX_CHANNELS */
#define SPCOM_MAX_ION_BUF_PER_CH (SPCOM_MAX_CHANNELS + 4)
diff --git a/include/uapi/linux/spcom.h b/include/uapi/linux/spcom.h
index 038a49d5ee57..39b1be03bde0 100644
--- a/include/uapi/linux/spcom.h
+++ b/include/uapi/linux/spcom.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-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
@@ -30,6 +30,12 @@
* with special size SPCOM_GET_NEXT_REQUEST_SIZE.
*/
+/*
+ * Maximum number of channel between Secure Processor and HLOS.
+ * including predefined channels, like "sp_kernel".
+ */
+#define SPCOM_MAX_CHANNELS 0x20
+
/* Maximum size (including null) for channel names */
#define SPCOM_CHANNEL_NAME_SIZE 32