Commit 9ae45035 authored by Yassine Oudjana's avatar Yassine Oudjana Committed by Bjorn Andersson
Browse files

remoteproc: qcom: pas: Use the same init resources for MSM8996 and MSM8998 



The resources for MSM8996 are missing power domains, and adding them
makes the resources identical to the MSM8998 ones.
Rename msm8998_adsp_resource to msm8996_adsp_resource then use it
for both chips. Also add power domains to slpi_resource_init and use
it for both chips.

Signed-off-by: default avatarYassine Oudjana <y.oudjana@protonmail.com>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210926190555.278589-3-y.oudjana@protonmail.com
parent cc73f503

drivers/remoteproc/qcom_q6v5_pas.c

+8 −19
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static const struct adsp_data sm8350_adsp_resource = { 
	.ssctl_id = 0x14,

};



static const struct adsp_data msm8998_adsp_resource = {

static const struct adsp_data msm8996_adsp_resource = {

		.crash_reason_smem = 423,

		.firmware_name = "adsp.mdt",

		.pas_id = 1,
@@ -700,6 +700,10 @@ static const struct adsp_data slpi_resource_init = { 
		.pas_id = 12,

		.has_aggre2_clk = true,

		.auto_boot = true,

		.proxy_pd_names = (char*[]){

			"ssc_cx",

			NULL

		},

		.ssr_name = "dsps",

		.sysmon_name = "slpi",

		.ssctl_id = 0x16,
@@ -756,21 +760,6 @@ static const struct adsp_data sm8350_slpi_resource = { 
	.ssctl_id = 0x16,

};



static const struct adsp_data msm8998_slpi_resource = {

		.crash_reason_smem = 424,

		.firmware_name = "slpi.mdt",

		.pas_id = 12,

		.has_aggre2_clk = true,

		.auto_boot = true,

		.proxy_pd_names = (char*[]){

			"ssc_cx",

			NULL

		},

		.ssr_name = "dsps",

		.sysmon_name = "slpi",

		.ssctl_id = 0x16,

};



static const struct adsp_data wcss_resource_init = {

	.crash_reason_smem = 421,

	.firmware_name = "wcnss.mdt",
@@ -799,10 +788,10 @@ static const struct adsp_data sdx55_mpss_resource = { 


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-adsp-pil", .data = &msm8996_adsp_resource},

	{ .compatible = "qcom,msm8996-slpi-pil", .data = &slpi_resource_init},

	{ .compatible = "qcom,msm8998-adsp-pas", .data = &msm8998_adsp_resource},

	{ .compatible = "qcom,msm8998-slpi-pas", .data = &msm8998_slpi_resource},

	{ .compatible = "qcom,msm8998-adsp-pas", .data = &msm8996_adsp_resource},

	{ .compatible = "qcom,msm8998-slpi-pas", .data = &slpi_resource_init},

	{ .compatible = "qcom,qcs404-adsp-pas", .data = &adsp_resource_init },

	{ .compatible = "qcom,qcs404-cdsp-pas", .data = &cdsp_resource_init },

	{ .compatible = "qcom,qcs404-wcss-pas", .data = &wcss_resource_init },