diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 14:49:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 14:49:31 +0200 |
| commit | cf1d9dd447935bd90d42ee349c1da2498cff8775 (patch) | |
| tree | 671c1f936122244e1dc663de47c45ac5a53ca285 /drivers/firmware | |
| parent | c442c8bd510614606b18578c47c3ec93764df7b5 (diff) | |
| parent | 6c8e99d874c96200ce985d19b407d49ed3306226 (diff) | |
| download | linux-cf1d9dd447935bd90d42ee349c1da2498cff8775.tar.bz2 | |
Merge tag 'qcom-drivers-for-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers
Merge "Qualcomm ARM Based Driver Updates for v4.8 Part 2" from Andy Gross:
* Fix probe order issue in SCM
* Add missing qcom_scm_is_available() API
* tag 'qcom-drivers-for-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
firmware: qcom: scm: Change initcall to subsys
firmware: qcom_scm: Add missing is_available API
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/qcom_scm.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index 84330c5f05d0..e64a501adbf4 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -308,6 +308,14 @@ static const struct reset_control_ops qcom_scm_pas_reset_ops = { .deassert = qcom_scm_pas_reset_deassert, }; +/** + * qcom_scm_is_available() - Checks if SCM is available + */ +bool qcom_scm_is_available(void) +{ + return !!__scm; +} +EXPORT_SYMBOL(qcom_scm_is_available); static int qcom_scm_probe(struct platform_device *pdev) { @@ -407,7 +415,7 @@ static int __init qcom_scm_init(void) return platform_driver_register(&qcom_scm_driver); } -arch_initcall(qcom_scm_init); +subsys_initcall(qcom_scm_init); static void __exit qcom_scm_exit(void) { |