diff options
| author | Kalle Valo | 2018-10-14 12:21:43 +0300 |
|---|---|---|
| committer | Kalle Valo | 2018-10-14 12:21:43 +0300 |
| commit | f95cd52476dee761a1a8ebe617dd01793e0eb39c (patch) | |
| tree | a72f30d36765b5871d66dc70e3f6f17149da7382 /include | |
| parent | 6bfa6975f1b72e3e65fb27eedabbe8348322f20a (diff) | |
| parent | ba94c753ccb471bafe8bd824b744fda6fee0001e (diff) | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 4.20. Major changes:
ath10k
* support NET_DETECT WoWLAN feature
* wcn3990 basic functionality now working after we got QMI support
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/qcom_scm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h index 5d65521260b3..06996ad4f2bc 100644 --- a/include/linux/qcom_scm.h +++ b/include/linux/qcom_scm.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2010-2015, 2018, The Linux Foundation. All rights reserved. * Copyright (C) 2015 Linaro Ltd. * * This program is free software; you can redistribute it and/or modify @@ -33,6 +33,8 @@ struct qcom_scm_vmperm { #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 |