According to the Intel sof design, it will create the name prefix appended with amp index for the amp codec only, such as: rt1318-1, rt1318-2, etc... But the rt1320 is a codec with amp and mic codec functions, it doesn't have the amp index in its name prefix as above. And then it will be hard to identify the codec if in multi-rt1320 case. So we add a flag to force the amp index to be appended.
Unified · Split
| @@ -83,6 +83,8 @@ struct asoc_sdw_codec_info { · 82 unmodified lines | ||
| 83 | 83 | const int dai_num; |
| 84 | 84 | struct asoc_sdw_aux_info auxs[SOC_SDW_MAX_AUX_NUM]; |
| 85 | 85 | const int aux_num; |
| 86 | + /* Force AMP-style name_prefix handling (append AMP index) even if MIC/Jack DAIs exist */ | |
| 87 | + const bool is_amp; | |
| 86 | 88 | |
| 87 | 89 | int (*codec_card_late_probe)(struct snd_soc_card *card); |
| 88 | 90 | |
| @@ -1232,6 +1232,16 @@ static struct snd_soc_acpi_adr_device *find_acpi_adr_device(struct device *dev, · 1231 unmodified lines | ||
| 1232 | 1232 | return NULL; |
| 1233 | 1233 | } |
| 1234 | 1234 | |
| 1235 | + /* | |
| 1236 | + * codec_info_list[].is_amp is a codec-level override: for multi-function | |
| 1237 | + * codecs we must treat the whole codec as an AMP when it is described as | |
| 1238 | + * such in the codec info table, even if some endpoints were detected as | |
| 1239 | + * non-AMP above. Callers/UCM rely on this to keep name_prefix and AMP | |
| 1240 | + * indexing stable and backwards compatible. | |
| 1241 | + */ | |
| 1242 | + if (codec_info_list[i].is_amp) | |
| 1243 | + is_amp = true; | |
| 1244 | + | |
| 1235 | 1245 | adr_dev[index].adr = ((u64)sdw_device->id.class_id & 0xFF) | |
| 1236 | 1246 | ((u64)sdw_device->id.part_id & 0xFFFF) << 8 | |
| 1237 | 1247 | ((u64)sdw_device->id.mfg_id & 0xFFFF) << 24 | |