Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[linux-2.6-microblaze.git] / drivers / firmware / qcom_scm.c

diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index 2ee97ba..7db8066 100644 (file)
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -252,7 +252,7 @@ static bool __qcom_scm_is_call_available(struct device *dev, u32 svc_id,
                break;
        default:
                pr_err("Unknown SMC convention being used\n");
-               return -EINVAL;
+               return false;
        }
 
        ret = qcom_scm_call(dev, &desc, &res);
@@ -1348,6 +1348,10 @@ static const struct of_device_id qcom_scm_dt_match[] = {
                                                             SCM_HAS_IFACE_CLK |
                                                             SCM_HAS_BUS_CLK)
        },
+       { .compatible = "qcom,scm-msm8953", .data = (void *)(SCM_HAS_CORE_CLK |
+                                                            SCM_HAS_IFACE_CLK |
+                                                            SCM_HAS_BUS_CLK)
+       },
        { .compatible = "qcom,scm-msm8974", .data = (void *)(SCM_HAS_CORE_CLK |
                                                             SCM_HAS_IFACE_CLK |
                                                             SCM_HAS_BUS_CLK)