| Message ID | 20220222061128.719400-2-AjitKumar.Pandey@amd.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: amd: acp: Add new machines and minor tweaks | expand |
On 22. 02. 22 7:11, Ajit Kumar Pandey wrote: > Change sound card name for guybrush machine with rt5682 as primary > codec and rt1019 amp to align with names given in UCM config. It's a Chrome OS UCM config? I don't have this config in upstream. > Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com> > --- > sound/soc/amd/acp/acp-legacy-mach.c | 4 ++-- > sound/soc/amd/acp/acp-renoir.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/amd/acp/acp-legacy-mach.c b/sound/soc/amd/acp/acp-legacy-mach.c > index 91140d15691b..50a5aa4d6da9 100644 > --- a/sound/soc/amd/acp/acp-legacy-mach.c > +++ b/sound/soc/amd/acp/acp-legacy-mach.c > @@ -96,7 +96,7 @@ static int acp_asoc_probe(struct platform_device *pdev) > > static const struct platform_device_id board_ids[] = { > { > - .name = "rn_rt5682_rt1019", > + .name = "acp3xalc56821019", > .driver_data = (kernel_ulong_t)&rt5682_rt1019_data, > }, > { } > @@ -113,5 +113,5 @@ module_platform_driver(acp_asoc_audio); > > MODULE_IMPORT_NS(SND_SOC_AMD_MACH); > MODULE_DESCRIPTION("ACP chrome audio support"); > -MODULE_ALIAS("platform:rn_rt5682_rt1019"); > +MODULE_ALIAS("platform:acp3xalc56821019"); > MODULE_LICENSE("GPL v2"); > diff --git a/sound/soc/amd/acp/acp-renoir.c b/sound/soc/amd/acp/acp-renoir.c > index d06ad5ce7fec..b8dc25a1d31d 100644 > --- a/sound/soc/amd/acp/acp-renoir.c > +++ b/sound/soc/amd/acp/acp-renoir.c > @@ -47,7 +47,7 @@ static struct snd_soc_acpi_codecs amp_rt1019 = { > static struct snd_soc_acpi_mach snd_soc_acpi_amd_acp_machines[] = { > { > .id = "10EC5682", > - .drv_name = "rn_rt5682_rt1019", > + .drv_name = "acp3xalc56821019", I find this naming cryptic. Also, we have other ways to identify the exact driver / hardware configuration. It may make sense to have one driver name (like amd-acp3x) and use the sound card components to refine the hardware configuration for the user space. Your way will introduce a lot of new drivers. Jaroslav
On 2/22/2022 1:45 PM, Jaroslav Kysela wrote: > [CAUTION: External Email] > > On 22. 02. 22 7:11, Ajit Kumar Pandey wrote: >> Change sound card name for guybrush machine with rt5682 as primary >> codec and rt1019 amp to align with names given in UCM config. > > It's a Chrome OS UCM config? I don't have this config in upstream Yes it's for Chrome OS UCM config only. > >> Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com> >> --- >> sound/soc/amd/acp/acp-legacy-mach.c | 4 ++-- >> sound/soc/amd/acp/acp-renoir.c | 2 +- >> 2 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/sound/soc/amd/acp/acp-legacy-mach.c >> b/sound/soc/amd/acp/acp-legacy-mach.c >> index 91140d15691b..50a5aa4d6da9 100644 >> --- a/sound/soc/amd/acp/acp-legacy-mach.c >> +++ b/sound/soc/amd/acp/acp-legacy-mach.c >> @@ -96,7 +96,7 @@ static int acp_asoc_probe(struct platform_device *pdev) >> >> static const struct platform_device_id board_ids[] = { >> { >> - .name = "rn_rt5682_rt1019", >> + .name = "acp3xalc56821019", >> .driver_data = (kernel_ulong_t)&rt5682_rt1019_data, >> }, >> { } >> @@ -113,5 +113,5 @@ module_platform_driver(acp_asoc_audio); >> >> MODULE_IMPORT_NS(SND_SOC_AMD_MACH); >> MODULE_DESCRIPTION("ACP chrome audio support"); >> -MODULE_ALIAS("platform:rn_rt5682_rt1019"); >> +MODULE_ALIAS("platform:acp3xalc56821019"); >> MODULE_LICENSE("GPL v2"); >> diff --git a/sound/soc/amd/acp/acp-renoir.c >> b/sound/soc/amd/acp/acp-renoir.c >> index d06ad5ce7fec..b8dc25a1d31d 100644 >> --- a/sound/soc/amd/acp/acp-renoir.c >> +++ b/sound/soc/amd/acp/acp-renoir.c >> @@ -47,7 +47,7 @@ static struct snd_soc_acpi_codecs amp_rt1019 = { >> static struct snd_soc_acpi_mach snd_soc_acpi_amd_acp_machines[] = { >> { >> .id = "10EC5682", >> - .drv_name = "rn_rt5682_rt1019", >> + .drv_name = "acp3xalc56821019", > > I find this naming cryptic. Also, we have other ways to identify the exact > driver / hardware configuration. It may make sense to have one driver name > (like amd-acp3x) and use the sound card components to refine the hardware > configuration for the user space. Your way will introduce a lot of new > drivers. > > Jaroslav > > -- > Jaroslav Kysela <perex@perex.cz> > Linux Sound Maintainer; ALSA Project; Red Hat, Inc. I agree that it's make more sense to have a unique driver name but that may require some additional code changes to identify hardware config and machine driver changes for sound card registration based on components. I'll surely look into this and try to refine our machine driver code in near future but it would be nice if we merge this for now. We will upload new patch series soon to support unique naming.
diff --git a/sound/soc/amd/acp/acp-legacy-mach.c b/sound/soc/amd/acp/acp-legacy-mach.c index 91140d15691b..50a5aa4d6da9 100644 --- a/sound/soc/amd/acp/acp-legacy-mach.c +++ b/sound/soc/amd/acp/acp-legacy-mach.c @@ -96,7 +96,7 @@ static int acp_asoc_probe(struct platform_device *pdev) static const struct platform_device_id board_ids[] = { { - .name = "rn_rt5682_rt1019", + .name = "acp3xalc56821019", .driver_data = (kernel_ulong_t)&rt5682_rt1019_data, }, { } @@ -113,5 +113,5 @@ module_platform_driver(acp_asoc_audio); MODULE_IMPORT_NS(SND_SOC_AMD_MACH); MODULE_DESCRIPTION("ACP chrome audio support"); -MODULE_ALIAS("platform:rn_rt5682_rt1019"); +MODULE_ALIAS("platform:acp3xalc56821019"); MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/amd/acp/acp-renoir.c b/sound/soc/amd/acp/acp-renoir.c index d06ad5ce7fec..b8dc25a1d31d 100644 --- a/sound/soc/amd/acp/acp-renoir.c +++ b/sound/soc/amd/acp/acp-renoir.c @@ -47,7 +47,7 @@ static struct snd_soc_acpi_codecs amp_rt1019 = { static struct snd_soc_acpi_mach snd_soc_acpi_amd_acp_machines[] = { { .id = "10EC5682", - .drv_name = "rn_rt5682_rt1019", + .drv_name = "acp3xalc56821019", .machine_quirk = snd_soc_acpi_codec_list, .quirk_data = &_rt1019, },
Change sound card name for guybrush machine with rt5682 as primary codec and rt1019 amp to align with names given in UCM config. Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com> --- sound/soc/amd/acp/acp-legacy-mach.c | 4 ++-- sound/soc/amd/acp/acp-renoir.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)