Merge tag 'qcom-drivers-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers

Qualcomm ARM Based Driver Updates for v4.10

* Fixup QCOM SCM to use devm_reset_controller_register
* Add QCOM pinctrl to Qualcomm MAINTAINERS entry
* Add PM8994 regulator definitions
* Add stub for WCNSS_CTRL API

* tag 'qcom-drivers-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  firmware: qcom: scm: Use devm_reset_controller_register()
  MAINTAINERS: add drivers/pinctrl/qcom to ARM/QUALCOMM SUPPORT
  pinctrl: pm8994: add pad voltage regulator defines
  soc: qcom: wcnss_ctrl: Stub wcnss_ctrl API

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
2016-11-17 23:38:27 -08:00
5 changed files with 27 additions and 1 deletions

View File

@@ -3,6 +3,19 @@
#include <linux/soc/qcom/smd.h>
#if IS_ENABLED(CONFIG_QCOM_WCNSS_CTRL)
struct qcom_smd_channel *qcom_wcnss_open_channel(void *wcnss, const char *name, qcom_smd_cb_t cb);
#else
static inline struct qcom_smd_channel*
qcom_wcnss_open_channel(void *wcnss, const char *name, qcom_smd_cb_t cb)
{
WARN_ON(1);
return ERR_PTR(-ENXIO);
}
#endif
#endif