aboutsummaryrefslogtreecommitdiff
path: root/rr-cache/50fb8c9f6de7874da63dc84eeefb2014c9123899/preimage
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2018-06-16 23:36:09 -0700
committerBjorn Andersson <bjorn.andersson@linaro.org>2018-06-16 23:36:09 -0700
commit3c5a6f65218ca6092d8241f273b11a54d3dfb0c6 (patch)
treeccea68cd073b433671078fe0ff6c1ea6e8c89ba9 /rr-cache/50fb8c9f6de7874da63dc84eeefb2014c9123899/preimage
parent742625615f10a1c7e7c4ab3110b02bc295243a14 (diff)
New rr-cache entries from ci-merge
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'rr-cache/50fb8c9f6de7874da63dc84eeefb2014c9123899/preimage')
-rw-r--r--rr-cache/50fb8c9f6de7874da63dc84eeefb2014c9123899/preimage40
1 files changed, 40 insertions, 0 deletions
diff --git a/rr-cache/50fb8c9f6de7874da63dc84eeefb2014c9123899/preimage b/rr-cache/50fb8c9f6de7874da63dc84eeefb2014c9123899/preimage
new file mode 100644
index 0000000..074bc39
--- /dev/null
+++ b/rr-cache/50fb8c9f6de7874da63dc84eeefb2014c9123899/preimage
@@ -0,0 +1,40 @@
+<<<<<<<
+=======
+/* SPDX-License-Identifier: GPL-2.0 */
+>>>>>>>
+#ifndef __DT_BINDINGS_QCOM_APR_H
+#define __DT_BINDINGS_QCOM_APR_H
+
+/* Domain IDs */
+<<<<<<<
+#define APR_DOMAIN_SIM 0x1
+#define APR_DOMAIN_PC 0x2
+#define APR_DOMAIN_MODEM 0x3
+#define APR_DOMAIN_ADSP 0x4
+#define APR_DOMAIN_APPS 0x5
+#define APR_DOMAIN_MAX 0x6
+=======
+#define APR_DOMAIN_SIM 0x1
+#define APR_DOMAIN_PC 0x2
+#define APR_DOMAIN_MODEM 0x3
+#define APR_DOMAIN_ADSP 0x4
+#define APR_DOMAIN_APPS 0x5
+#define APR_DOMAIN_MAX 0x6
+>>>>>>>
+
+/* ADSP service IDs */
+#define APR_SVC_ADSP_CORE 0x3
+#define APR_SVC_AFE 0x4
+#define APR_SVC_VSM 0x5
+#define APR_SVC_VPM 0x6
+#define APR_SVC_ASM 0x7
+#define APR_SVC_ADM 0x8
+#define APR_SVC_ADSP_MVM 0x09
+#define APR_SVC_ADSP_CVS 0x0A
+#define APR_SVC_ADSP_CVP 0x0B
+#define APR_SVC_USM 0x0C
+#define APR_SVC_LSM 0x0D
+#define APR_SVC_VIDC 0x16
+#define APR_SVC_MAX 0x17
+
+#endif /* __DT_BINDINGS_QCOM_APR_H */