diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-05-06 09:56:19 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-05-06 09:56:19 -0700 |
| commit | b5bfdbe6270aa8017bcfe680ccfdaa4e3be2b3a6 (patch) | |
| tree | 90e06c1da7fe205519a630ebc64ec4942ee5245a | |
| parent | bc33a9fcee77e47749a36e2abcc0bb73f2b60fe5 (diff) | |
| parent | 404b7fade5bb65ee734281dbf1da78d4457b33dd (diff) | |
Merge "qseecom: add a new flag commonlib64-loaded-by-uefi" into msm-4.4
| -rw-r--r-- | Documentation/devicetree/bindings/qseecom/qseecom.txt | 1 | ||||
| -rw-r--r-- | drivers/misc/qseecom.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/qseecom/qseecom.txt b/Documentation/devicetree/bindings/qseecom/qseecom.txt index 1a04d881fcae..a6bf4147460e 100644 --- a/Documentation/devicetree/bindings/qseecom/qseecom.txt +++ b/Documentation/devicetree/bindings/qseecom/qseecom.txt @@ -25,6 +25,7 @@ Optional properties: - qcom,appsbl-qseecom-support : indicates if there is qseecom support in appsbootloader - vdd-hba-supply : handle for fixed power regulator - qcom,qsee-reentrancy-support: indicates the qsee reentrancy phase supported by the target + - qcom,commonlib64-loaded-by-uefi: indicates commonlib64 is loaded by uefi already Example: qcom,qseecom@fe806000 { diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c index e4694b6d5f5b..2455e0b06a51 100644 --- a/drivers/misc/qseecom.c +++ b/drivers/misc/qseecom.c @@ -7709,6 +7709,11 @@ static int qseecom_probe(struct platform_device *pdev) pr_debug("qseecom.appsbl_qseecom_support = 0x%x", qseecom.appsbl_qseecom_support); + qseecom.commonlib64_loaded = + of_property_read_bool((&pdev->dev)->of_node, + "qcom,commonlib64-loaded-by-uefi"); + pr_debug("qseecom.commonlib64-loaded-by-uefi = 0x%x", + qseecom.commonlib64_loaded); qseecom.no_clock_support = of_property_read_bool((&pdev->dev)->of_node, "qcom,no-clock-support"); |