@@ -1017,7 +1017,7 @@ static const struct adsp_data sc8180x_mpss_resource = {
1017
1017
.ssctl_id = 0x12 ,
1018
1018
};
1019
1019
1020
- static const struct adsp_data slpi_resource_init = {
1020
+ static const struct adsp_data msm8996_slpi_resource_init = {
1021
1021
.crash_reason_smem = 424 ,
1022
1022
.firmware_name = "slpi.mdt" ,
1023
1023
.pas_id = 12 ,
@@ -1031,7 +1031,7 @@ static const struct adsp_data slpi_resource_init = {
1031
1031
.ssctl_id = 0x16 ,
1032
1032
};
1033
1033
1034
- static const struct adsp_data sm8150_slpi_resource = {
1034
+ static const struct adsp_data sdm845_slpi_resource_init = {
1035
1035
.crash_reason_smem = 424 ,
1036
1036
.firmware_name = "slpi.mdt" ,
1037
1037
.pas_id = 12 ,
@@ -1047,38 +1047,6 @@ static const struct adsp_data sm8150_slpi_resource = {
1047
1047
.ssctl_id = 0x16 ,
1048
1048
};
1049
1049
1050
- static const struct adsp_data sm8250_slpi_resource = {
1051
- .crash_reason_smem = 424 ,
1052
- .firmware_name = "slpi.mdt" ,
1053
- .pas_id = 12 ,
1054
- .auto_boot = true,
1055
- .proxy_pd_names = (char * []){
1056
- "lcx" ,
1057
- "lmx" ,
1058
- NULL
1059
- },
1060
- .load_state = "slpi" ,
1061
- .ssr_name = "dsps" ,
1062
- .sysmon_name = "slpi" ,
1063
- .ssctl_id = 0x16 ,
1064
- };
1065
-
1066
- static const struct adsp_data sm8350_slpi_resource = {
1067
- .crash_reason_smem = 424 ,
1068
- .firmware_name = "slpi.mdt" ,
1069
- .pas_id = 12 ,
1070
- .auto_boot = true,
1071
- .proxy_pd_names = (char * []){
1072
- "lcx" ,
1073
- "lmx" ,
1074
- NULL
1075
- },
1076
- .load_state = "slpi" ,
1077
- .ssr_name = "dsps" ,
1078
- .sysmon_name = "slpi" ,
1079
- .ssctl_id = 0x16 ,
1080
- };
1081
-
1082
1050
static const struct adsp_data wcss_resource_init = {
1083
1051
.crash_reason_smem = 421 ,
1084
1052
.firmware_name = "wcnss.mdt" ,
@@ -1187,9 +1155,9 @@ static const struct of_device_id adsp_of_match[] = {
1187
1155
{ .compatible = "qcom,msm8953-adsp-pil" , .data = & msm8996_adsp_resource },
1188
1156
{ .compatible = "qcom,msm8974-adsp-pil" , .data = & adsp_resource_init },
1189
1157
{ .compatible = "qcom,msm8996-adsp-pil" , .data = & msm8996_adsp_resource },
1190
- { .compatible = "qcom,msm8996-slpi-pil" , .data = & slpi_resource_init },
1158
+ { .compatible = "qcom,msm8996-slpi-pil" , .data = & msm8996_slpi_resource_init },
1191
1159
{ .compatible = "qcom,msm8998-adsp-pas" , .data = & msm8996_adsp_resource },
1192
- { .compatible = "qcom,msm8998-slpi-pas" , .data = & slpi_resource_init },
1160
+ { .compatible = "qcom,msm8998-slpi-pas" , .data = & msm8996_slpi_resource_init },
1193
1161
{ .compatible = "qcom,qcs404-adsp-pas" , .data = & adsp_resource_init },
1194
1162
{ .compatible = "qcom,qcs404-cdsp-pas" , .data = & cdsp_resource_init },
1195
1163
{ .compatible = "qcom,qcs404-wcss-pas" , .data = & wcss_resource_init },
@@ -1214,17 +1182,17 @@ static const struct of_device_id adsp_of_match[] = {
1214
1182
{ .compatible = "qcom,sm8150-adsp-pas" , .data = & sm8150_adsp_resource },
1215
1183
{ .compatible = "qcom,sm8150-cdsp-pas" , .data = & sm8150_cdsp_resource },
1216
1184
{ .compatible = "qcom,sm8150-mpss-pas" , .data = & mpss_resource_init },
1217
- { .compatible = "qcom,sm8150-slpi-pas" , .data = & sm8150_slpi_resource },
1185
+ { .compatible = "qcom,sm8150-slpi-pas" , .data = & sdm845_slpi_resource_init },
1218
1186
{ .compatible = "qcom,sm8250-adsp-pas" , .data = & sm8250_adsp_resource },
1219
1187
{ .compatible = "qcom,sm8250-cdsp-pas" , .data = & sm8250_cdsp_resource },
1220
- { .compatible = "qcom,sm8250-slpi-pas" , .data = & sm8250_slpi_resource },
1188
+ { .compatible = "qcom,sm8250-slpi-pas" , .data = & sdm845_slpi_resource_init },
1221
1189
{ .compatible = "qcom,sm8350-adsp-pas" , .data = & sm8350_adsp_resource },
1222
1190
{ .compatible = "qcom,sm8350-cdsp-pas" , .data = & sm8350_cdsp_resource },
1223
- { .compatible = "qcom,sm8350-slpi-pas" , .data = & sm8350_slpi_resource },
1191
+ { .compatible = "qcom,sm8350-slpi-pas" , .data = & sdm845_slpi_resource_init },
1224
1192
{ .compatible = "qcom,sm8350-mpss-pas" , .data = & mpss_resource_init },
1225
1193
{ .compatible = "qcom,sm8450-adsp-pas" , .data = & sm8350_adsp_resource },
1226
1194
{ .compatible = "qcom,sm8450-cdsp-pas" , .data = & sm8350_cdsp_resource },
1227
- { .compatible = "qcom,sm8450-slpi-pas" , .data = & sm8350_slpi_resource },
1195
+ { .compatible = "qcom,sm8450-slpi-pas" , .data = & sdm845_slpi_resource_init },
1228
1196
{ .compatible = "qcom,sm8450-mpss-pas" , .data = & sm8450_mpss_resource },
1229
1197
{ .compatible = "qcom,sm8550-adsp-pas" , .data = & sm8550_adsp_resource },
1230
1198
{ .compatible = "qcom,sm8550-cdsp-pas" , .data = & sm8550_cdsp_resource },
0 commit comments