Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf1d9dd4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-drivers-for-4.8-2' of... 

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
parents c442c8bd 6c8e99d8

drivers/firmware/qcom_scm.c

+9 −1
Original line number Diff line number Diff line
@@ -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)

{