ASoC: Intel: broadwell: simplify card names for SOF uses
Blindly adding an sof- prefix to the card name is not user friendly and causes UCM issues with a driver name truncated to 16 characters. Simplify to use "sof-bdw <codec_name>" pattern for all Broadwell machine drivers. The sof- prefix is added by the core. A generic "SOF" driver name is used, and UCMv2 will detect the configuration for this driver by testing the card name. Legacy uses are unmodified. Suggested-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://lore.kernel.org/r/20200617165616.18511-4-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
此提交包含在:
@@ -291,9 +291,19 @@ static int broadwell_resume(struct snd_soc_card *card){
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL)
|
||||
/* use space before codec name to simplify card ID, and simplify driver name */
|
||||
#define CARD_NAME "bdw rt286" /* card name will be 'sof-bdw rt286' */
|
||||
#define DRIVER_NAME "SOF"
|
||||
#else
|
||||
#define CARD_NAME "broadwell-rt286"
|
||||
#define DRIVER_NAME NULL /* card name will be used for driver name */
|
||||
#endif
|
||||
|
||||
/* broadwell audio machine driver for WPT + RT286S */
|
||||
static struct snd_soc_card broadwell_rt286 = {
|
||||
.name = "broadwell-rt286",
|
||||
.name = CARD_NAME,
|
||||
.driver_name = DRIVER_NAME,
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = broadwell_rt286_dais,
|
||||
.num_links = ARRAY_SIZE(broadwell_rt286_dais),
|
||||
|
新增問題並參考
封鎖使用者