diff options
| author | Linaro CI <ci_notify@linaro.org> | 2018-05-24 09:19:51 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2018-05-24 09:19:51 +0000 |
| commit | e74b87e003c1afe255e81688f9e4462bf05b1cc3 (patch) | |
| tree | 365e51fbb765c759149bb6508253cde9c24909f3 | |
| parent | fa5c8e051f1e98dfc136fc29bb31ad76ea600a83 (diff) | |
| parent | 3421c105b37b355082bf612ae875a19658424c1d (diff) | |
Merge remote-tracking branch 'sdm845-misc/tracking-qcomlt-sdm845-misc' into integration-linux-qcomlt
| -rw-r--r-- | Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt | 1 | ||||
| -rw-r--r-- | drivers/mailbox/qcom-apcs-ipc-mailbox.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt index 16964f0c1773..8ea0f12b8d0b 100644 --- a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt +++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt @@ -10,6 +10,7 @@ platforms. Definition: must be one of: "qcom,msm8916-apcs-kpss-global", "qcom,msm8996-apcs-hmss-global" + "qcom,sdm845-apss-shared" - reg: Usage: required diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c index 57bde0dfd12f..75da44d25fac 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -125,6 +125,7 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev) static const struct of_device_id qcom_apcs_ipc_of_match[] = { { .compatible = "qcom,msm8916-apcs-kpss-global", .data = (void *)8 }, { .compatible = "qcom,msm8996-apcs-hmss-global", .data = (void *)16 }, + { .compatible = "qcom,sdm845-apss-shared", .data = (void *)12 }, {} }; MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match); |