xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Intel: broadwell: simplify card names for SOF uses

Browse Source 
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>
This commit is contained in:
Pierre-Louis Bossart
2020-06-17 11:56:16 -05:00
committed by Mark Brown
parent 7bfbddfc98
commit a5f610c0fa
3 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/intel/boards/bdw-rt5650.c
View File

@@ -297,9 +297,19 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
}, },
}; };
#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 rt5650" /* card name will be 'sof-bdw rt5650' */
#define DRIVER_NAME "SOF"
#else
#define CARD_NAME "bdw-rt5650"
#define DRIVER_NAME NULL /* card name will be used for driver name */
#endif
/* ASoC machine driver for Broadwell DSP + RT5650 */ /* ASoC machine driver for Broadwell DSP + RT5650 */
static struct snd_soc_card bdw_rt5650_card = { static struct snd_soc_card bdw_rt5650_card = {
.name = "bdw-rt5650", .name = CARD_NAME,
.driver_name = DRIVER_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.dai_link = bdw_rt5650_dais, .dai_link = bdw_rt5650_dais,
.num_links = ARRAY_SIZE(bdw_rt5650_dais), .num_links = ARRAY_SIZE(bdw_rt5650_dais),

12
sound/soc/intel/boards/bdw-rt5677.c
View File

@@ -404,9 +404,19 @@ static int bdw_rt5677_resume_post(struct snd_soc_card *card)
return 0; 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 rt5677" /* card name will be 'sof-bdw rt5677' */
#define DRIVER_NAME "SOF"
#else
#define CARD_NAME "bdw-rt5677"
#define DRIVER_NAME NULL /* card name will be used for driver name */
#endif
/* ASoC machine driver for Broadwell DSP + RT5677 */ /* ASoC machine driver for Broadwell DSP + RT5677 */
static struct snd_soc_card bdw_rt5677_card = { static struct snd_soc_card bdw_rt5677_card = {
.name = "bdw-rt5677", .name = CARD_NAME,
.driver_name = DRIVER_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.dai_link = bdw_rt5677_dais, .dai_link = bdw_rt5677_dais,
.num_links = ARRAY_SIZE(bdw_rt5677_dais), .num_links = ARRAY_SIZE(bdw_rt5677_dais),

12
sound/soc/intel/boards/broadwell.c
View File

@@ -291,9 +291,19 @@ static int broadwell_resume(struct snd_soc_card *card){
return 0; 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 */ /* broadwell audio machine driver for WPT + RT286S */
static struct snd_soc_card broadwell_rt286 = { static struct snd_soc_card broadwell_rt286 = {
.name = "broadwell-rt286", .name = CARD_NAME,
.driver_name = DRIVER_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.dai_link = broadwell_rt286_dais, .dai_link = broadwell_rt286_dais,
.num_links = ARRAY_SIZE(broadwell_rt286_dais), .num_links = ARRAY_SIZE(broadwell_rt286_dais),