Commit 637e98bf authored by Dylan Van Assche's avatar Dylan Van Assche Committed by Bjorn Andersson
Browse files

remoteproc: qcom: pas: refactor SLPI remoteproc init 



SLPI remoteproc initialization is the same for SDM845, SM8150, SM8250,
SM8350 but is duplicated for each compatible. Refactor initialization
structs for these 4 compatibles as a single struct.

Signed-off-by: default avatarDylan Van Assche <me@dylanvanassche.be>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230330164633.117335-3-me@dylanvanassche.be


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent 242a6268

drivers/remoteproc/qcom_q6v5_pas.c

+8 −40
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ static const struct adsp_data sc8180x_mpss_resource = { 
	.ssctl_id = 0x12,

};



static const struct adsp_data slpi_resource_init = {

static const struct adsp_data msm8996_slpi_resource_init = {

		.crash_reason_smem = 424,

		.firmware_name = "slpi.mdt",

		.pas_id = 12,
@@ -1031,39 +1031,7 @@ static const struct adsp_data slpi_resource_init = { 
		.ssctl_id = 0x16,

};



static const struct adsp_data sm8150_slpi_resource = {

		.crash_reason_smem = 424,

		.firmware_name = "slpi.mdt",

		.pas_id = 12,

		.auto_boot = true,

		.proxy_pd_names = (char*[]){

			"lcx",

			"lmx",

			NULL

		},

		.load_state = "slpi",

		.ssr_name = "dsps",

		.sysmon_name = "slpi",

		.ssctl_id = 0x16,

};



static const struct adsp_data sm8250_slpi_resource = {

	.crash_reason_smem = 424,

	.firmware_name = "slpi.mdt",

	.pas_id = 12,

	.auto_boot = true,

	.proxy_pd_names = (char*[]){

		"lcx",

		"lmx",

		NULL

	},

	.load_state = "slpi",

	.ssr_name = "dsps",

	.sysmon_name = "slpi",

	.ssctl_id = 0x16,

};



static const struct adsp_data sm8350_slpi_resource = {

static const struct adsp_data sdm845_slpi_resource_init = {

		.crash_reason_smem = 424,

		.firmware_name = "slpi.mdt",

		.pas_id = 12,
@@ -1187,9 +1155,9 @@ static const struct of_device_id adsp_of_match[] = { 
	{ .compatible = "qcom,msm8953-adsp-pil", .data = &msm8996_adsp_resource},

	{ .compatible = "qcom,msm8974-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,msm8996-slpi-pil", .data = &msm8996_slpi_resource_init},

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

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

	{ .compatible = "qcom,msm8998-slpi-pas", .data = &msm8996_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 },
@@ -1214,17 +1182,17 @@ static const struct of_device_id adsp_of_match[] = { 
	{ .compatible = "qcom,sm8150-adsp-pas", .data = &sm8150_adsp_resource},

	{ .compatible = "qcom,sm8150-cdsp-pas", .data = &sm8150_cdsp_resource},

	{ .compatible = "qcom,sm8150-mpss-pas", .data = &mpss_resource_init},

	{ .compatible = "qcom,sm8150-slpi-pas", .data = &sm8150_slpi_resource},

	{ .compatible = "qcom,sm8150-slpi-pas", .data = &sdm845_slpi_resource_init},

	{ .compatible = "qcom,sm8250-adsp-pas", .data = &sm8250_adsp_resource},

	{ .compatible = "qcom,sm8250-cdsp-pas", .data = &sm8250_cdsp_resource},

	{ .compatible = "qcom,sm8250-slpi-pas", .data = &sm8250_slpi_resource},

	{ .compatible = "qcom,sm8250-slpi-pas", .data = &sdm845_slpi_resource_init},

	{ .compatible = "qcom,sm8350-adsp-pas", .data = &sm8350_adsp_resource},

	{ .compatible = "qcom,sm8350-cdsp-pas", .data = &sm8350_cdsp_resource},

	{ .compatible = "qcom,sm8350-slpi-pas", .data = &sm8350_slpi_resource},

	{ .compatible = "qcom,sm8350-slpi-pas", .data = &sdm845_slpi_resource_init},

	{ .compatible = "qcom,sm8350-mpss-pas", .data = &mpss_resource_init},

	{ .compatible = "qcom,sm8450-adsp-pas", .data = &sm8350_adsp_resource},

	{ .compatible = "qcom,sm8450-cdsp-pas", .data = &sm8350_cdsp_resource},

	{ .compatible = "qcom,sm8450-slpi-pas", .data = &sm8350_slpi_resource},

	{ .compatible = "qcom,sm8450-slpi-pas", .data = &sdm845_slpi_resource_init},

	{ .compatible = "qcom,sm8450-mpss-pas", .data = &sm8450_mpss_resource},

	{ .compatible = "qcom,sm8550-adsp-pas", .data = &sm8550_adsp_resource},

	{ .compatible = "qcom,sm8550-cdsp-pas", .data = &sm8550_cdsp_resource},