From 9dd19a9ae36bc60d58287d0c52e53024d484e64d Mon Sep 17 00:00:00 2001 From: Gokul Sriram Palanisamy Date: Fri, 29 Jan 2021 22:41:59 +0530 Subject: [PATCH 2/3] remoteproc: qcom: wcss: populate driver data for IPQ6018 Populate hardcoded param using driver data for IPQ6018 SoCs. Signed-off-by: Gokul Sriram Palanisamy --- drivers/remoteproc/qcom_q6v5_wcss.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) --- a/drivers/remoteproc/qcom_q6v5_wcss.c +++ b/drivers/remoteproc/qcom_q6v5_wcss.c @@ -969,7 +969,7 @@ static int q6v5_alloc_memory_region(stru return 0; } -static int ipq8074_init_clock(struct q6v5_wcss *wcss) +static int ipq_init_clock(struct q6v5_wcss *wcss) { int ret; @@ -1176,7 +1176,7 @@ static void q6v5_wcss_remove(struct plat } static const struct wcss_data wcss_ipq8074_res_init = { - .init_clock = ipq8074_init_clock, + .init_clock = ipq_init_clock, .q6_firmware_name = "IPQ8074/q6_fw.mdt", .m3_firmware_name = "IPQ8074/m3_fw.mdt", .crash_reason_smem = WCSS_CRASH_REASON, @@ -1190,6 +1190,20 @@ static const struct wcss_data wcss_ipq80 .need_auto_boot = false, }; +static const struct wcss_data wcss_ipq6018_res_init = { + .init_clock = ipq_init_clock, + .q6_firmware_name = "IPQ6018/q6_fw.mdt", + .m3_firmware_name = "IPQ6018/m3_fw.mdt", + .crash_reason_smem = WCSS_CRASH_REASON, + .aon_reset_required = true, + .wcss_q6_reset_required = true, + .bcr_reset_required = false, + .ssr_name = "q6wcss", + .ops = &q6v5_wcss_ipq8074_ops, + .requires_force_stop = true, + .need_mem_protection = true, +}; + static const struct wcss_data wcss_qcs404_res_init = { .init_clock = qcs404_init_clock, .init_regulator = qcs404_init_regulator, @@ -1209,6 +1223,7 @@ static const struct wcss_data wcss_qcs40 static const struct of_device_id q6v5_wcss_of_match[] = { { .compatible = "qcom,ipq8074-wcss-pil", .data = &wcss_ipq8074_res_init }, + { .compatible = "qcom,ipq6018-wcss-pil", .data = &wcss_ipq6018_res_init }, { .compatible = "qcom,qcs404-wcss-pil", .data = &wcss_qcs404_res_init }, { }, };