diff options
| author | Bjorn Andersson <andersson@kernel.org> | 2023-01-10 22:55:42 -0600 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2023-01-10 22:55:42 -0600 |
| commit | 538b0ba217bb9734e0d5f0c240b2833d3e83bdfa (patch) | |
| tree | a65b06febde28943fce5303f79d5a9d496fbca23 /include | |
| parent | 5b8db5b4f756bcb3a3f9b6577f32fc0d3867496f (diff) | |
| parent | 45ca30eb9dfe622b00ce352cf28ee141d243254b (diff) | |
| download | linux-stable-538b0ba217bb9734e0d5f0c240b2833d3e83bdfa.tar.gz linux-stable-538b0ba217bb9734e0d5f0c240b2833d3e83bdfa.tar.bz2 linux-stable-538b0ba217bb9734e0d5f0c240b2833d3e83bdfa.zip | |
Merge branch '20230109130523.298971-3-konrad.dybcio@linaro.org' into drivers-for-6.3
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/firmware/qcom,scm.h | 16 | ||||
| -rw-r--r-- | include/linux/qcom_scm.h | 6 |
2 files changed, 18 insertions, 4 deletions
diff --git a/include/dt-bindings/firmware/qcom,scm.h b/include/dt-bindings/firmware/qcom,scm.h new file mode 100644 index 000000000000..1a4e68fa0744 --- /dev/null +++ b/include/dt-bindings/firmware/qcom,scm.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */ +/* + * Copyright (c) 2010-2015, 2018-2019 The Linux Foundation. All rights reserved. + * Copyright (C) 2015 Linaro Ltd. + */ + +#ifndef _DT_BINDINGS_FIRMWARE_QCOM_SCM_H +#define _DT_BINDINGS_FIRMWARE_QCOM_SCM_H + +#define QCOM_SCM_VMID_HLOS 0x3 +#define QCOM_SCM_VMID_MSS_MSA 0xF +#define QCOM_SCM_VMID_WLAN 0x18 +#define QCOM_SCM_VMID_WLAN_CE 0x19 +#define QCOM_SCM_VMID_NAV 0x2B + +#endif diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h index f8335644a01a..1e449a5d7f5c 100644 --- a/include/linux/qcom_scm.h +++ b/include/linux/qcom_scm.h @@ -9,6 +9,8 @@ #include <linux/types.h> #include <linux/cpumask.h> +#include <dt-bindings/firmware/qcom,scm.h> + #define QCOM_SCM_VERSION(major, minor) (((major) << 16) | ((minor) & 0xFF)) #define QCOM_SCM_CPU_PWR_DOWN_L2_ON 0x0 #define QCOM_SCM_CPU_PWR_DOWN_L2_OFF 0x1 @@ -51,10 +53,6 @@ enum qcom_scm_ice_cipher { QCOM_SCM_ICE_CIPHER_AES_256_CBC = 4, }; -#define QCOM_SCM_VMID_HLOS 0x3 -#define QCOM_SCM_VMID_MSS_MSA 0xF -#define QCOM_SCM_VMID_WLAN 0x18 -#define QCOM_SCM_VMID_WLAN_CE 0x19 #define QCOM_SCM_PERM_READ 0x4 #define QCOM_SCM_PERM_WRITE 0x2 #define QCOM_SCM_PERM_EXEC 0x1 |