remoteproc: qcom: adsp: Add SDM845 ADSP and CDSP support

Add support for booting the Audio and Compute DSPs found in Qualcomm's
SDM845 platform.

As with the previous platforms the power rail handling needs to be
updated once the appropriate support lands upstream.

Acked-by: Rob Herring <robh@kernel.org>
Tested-by: Sibi Sankar <sibis@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt b/Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt
index 728e4193f7a689e1cc406ba2cb29e29534c93283..b7d05822818546c6b1d1bd5276d034da14eb9845 100644 (file)
--- a/Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt
+++ b/Documentation/devicetree/bindings/remoteproc/qcom,adsp.txt
@@ -10,6 +10,8 @@ on the Qualcomm ADSP Hexagon core.
                    "qcom,msm8974-adsp-pil"
                    "qcom,msm8996-adsp-pil"
                    "qcom,msm8996-slpi-pil"
+                   "qcom,sdm845-adsp-pas"
+                   "qcom,sdm845-cdsp-pas"
 
 - interrupts-extended:
        Usage: required

diff --git a/drivers/remoteproc/qcom_adsp_pil.c b/drivers/remoteproc/qcom_adsp_pil.c
index d4339a6da616ecfa9d201ca38cece5ee35e7696b..da2254ea11353442b4e943a273128b2bf5256c1a 100644 (file)
--- a/drivers/remoteproc/qcom_adsp_pil.c
+++ b/drivers/remoteproc/qcom_adsp_pil.c
@@ -342,6 +342,16 @@ static const struct adsp_data adsp_resource_init = {
                .ssctl_id = 0x14,
 };
 
+static const struct adsp_data cdsp_resource_init = {
+       .crash_reason_smem = 601,
+       .firmware_name = "cdsp.mdt",
+       .pas_id = 18,
+       .has_aggre2_clk = false,
+       .ssr_name = "cdsp",
+       .sysmon_name = "cdsp",
+       .ssctl_id = 0x17,
+};
+
 static const struct adsp_data slpi_resource_init = {
                .crash_reason_smem = 424,
                .firmware_name = "slpi.mdt",
@@ -356,6 +366,8 @@ static const struct of_device_id adsp_of_match[] = {
        { .compatible = "qcom,msm8974-adsp-pil", .data = &adsp_resource_init},
        { .compatible = "qcom,msm8996-adsp-pil", .data = &adsp_resource_init},
        { .compatible = "qcom,msm8996-slpi-pil", .data = &slpi_resource_init},
+       { .compatible = "qcom,sdm845-adsp-pas", .data = &adsp_resource_init},
+       { .compatible = "qcom,sdm845-cdsp-pas", .data = &cdsp_resource_init},
        { },
 };
 MODULE_DEVICE_TABLE(of, adsp_of_match);