| Message ID | 1611940320-24830-3-git-send-email-gokulsri@codeaurora.org |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
On Fri 29 Jan 11:11 CST 2021, Gokul Sriram Palanisamy wrote: > Populate hardcoded param using driver data for IPQ6018 SoCs. > > Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org> > --- > drivers/remoteproc/qcom_q6v5_wcss.c | 19 +++++++++++++++++-- > 1 file changed, 17 insertions(+), 2 deletions(-) > > diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c > index 7c64bfc..bc9531c 100644 > --- a/drivers/remoteproc/qcom_q6v5_wcss.c > +++ b/drivers/remoteproc/qcom_q6v5_wcss.c > @@ -965,7 +965,7 @@ static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss) > return 0; > } > > -static int ipq8074_init_clock(struct q6v5_wcss *wcss) > +static int ipq_init_clock(struct q6v5_wcss *wcss) > { > int ret; > > @@ -1172,7 +1172,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev) > } > > 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, > @@ -1185,6 +1185,20 @@ static const struct wcss_data wcss_ipq8074_res_init = { > .need_mem_protection = true, > }; > > +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, > @@ -1203,6 +1217,7 @@ static const struct wcss_data wcss_qcs404_res_init = { > > 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 }, As you rebase on the reworked dependency, please sorted alphabetically (i.e 6 < 8) Regards, Bjorn > { .compatible = "qcom,qcs404-wcss-pil", .data = &wcss_qcs404_res_init }, > { }, > }; > -- > 2.7.4 >
diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c index 7c64bfc..bc9531c 100644 --- a/drivers/remoteproc/qcom_q6v5_wcss.c +++ b/drivers/remoteproc/qcom_q6v5_wcss.c @@ -965,7 +965,7 @@ static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss) return 0; } -static int ipq8074_init_clock(struct q6v5_wcss *wcss) +static int ipq_init_clock(struct q6v5_wcss *wcss) { int ret; @@ -1172,7 +1172,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev) } 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, @@ -1185,6 +1185,20 @@ static const struct wcss_data wcss_ipq8074_res_init = { .need_mem_protection = true, }; +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, @@ -1203,6 +1217,7 @@ static const struct wcss_data wcss_qcs404_res_init = { 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 }, { }, };
Populate hardcoded param using driver data for IPQ6018 SoCs. Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org> --- drivers/remoteproc/qcom_q6v5_wcss.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)