redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: mediatek: mt8192: rename common symbols 

Renames common symbols from "mt8192_mt6359_rt1015_rt5682" to
"mt8192_mt6359".

They will share between a few machine drivers on MT8192 and MT6359
with some different audio components.

Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20201201132614.1691352-2-tzungbi@google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
zero-sugar-mainline-defconfig
Tzung-Bi Shih 2020-12-01 21:26:09 +08:00 committed by Mark Brown
parent e5879d9882
commit a5f8037505
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
View File

@ -631,7 +631,7 @@ SND_SOC_DAILINK_DEFS(tdm,
DAILINK_COMP_ARRAY(COMP_DUMMY()), DAILINK_COMP_ARRAY(COMP_DUMMY()),
DAILINK_COMP_ARRAY(COMP_EMPTY())); DAILINK_COMP_ARRAY(COMP_EMPTY()));
static struct snd_soc_dai_link mt8192_mt6359_rt1015_rt5682_dai_links[] = { static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
/* Front End DAI links */ /* Front End DAI links */
{ {
.name = "Playback_1", .name = "Playback_1",
@ -986,8 +986,8 @@ static struct snd_soc_codec_conf rt1015_amp_conf[] = {
static struct snd_soc_card mt8192_mt6359_rt1015_rt5682_soc_card = { static struct snd_soc_card mt8192_mt6359_rt1015_rt5682_soc_card = {
.name = "mt8192_mt6359_rt1015_rt5682", .name = "mt8192_mt6359_rt1015_rt5682",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.dai_link = mt8192_mt6359_rt1015_rt5682_dai_links, .dai_link = mt8192_mt6359_dai_links,
.num_links = ARRAY_SIZE(mt8192_mt6359_rt1015_rt5682_dai_links), .num_links = ARRAY_SIZE(mt8192_mt6359_dai_links),
.controls = mt8192_mt6359_rt1015_rt5682_controls, .controls = mt8192_mt6359_rt1015_rt5682_controls,
.num_controls = ARRAY_SIZE(mt8192_mt6359_rt1015_rt5682_controls), .num_controls = ARRAY_SIZE(mt8192_mt6359_rt1015_rt5682_controls),
.dapm_widgets = mt8192_mt6359_rt1015_rt5682_widgets, .dapm_widgets = mt8192_mt6359_rt1015_rt5682_widgets,
@ -998,7 +998,7 @@ static struct snd_soc_card mt8192_mt6359_rt1015_rt5682_soc_card = {
.num_configs = ARRAY_SIZE(rt1015_amp_conf), .num_configs = ARRAY_SIZE(rt1015_amp_conf),
}; };
static int mt8192_mt6359_rt1015_rt5682_dev_probe(struct platform_device *pdev) static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
{ {
struct snd_soc_card *card = &mt8192_mt6359_rt1015_rt5682_soc_card; struct snd_soc_card *card = &mt8192_mt6359_rt1015_rt5682_soc_card;
struct device_node *platform_node; struct device_node *platform_node;
@ -1029,32 +1029,32 @@ static int mt8192_mt6359_rt1015_rt5682_dev_probe(struct platform_device *pdev)
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id mt8192_mt6359_rt1015_rt5682_dt_match[] = { static const struct of_device_id mt8192_mt6359_dt_match[] = {
{.compatible = "mediatek,mt8192_mt6359_rt1015_rt5682",}, {.compatible = "mediatek,mt8192_mt6359_rt1015_rt5682",},
{} {}
}; };
#endif #endif
static const struct dev_pm_ops mt8192_mt6359_rt1015_rt5682_pm_ops = { static const struct dev_pm_ops mt8192_mt6359_pm_ops = {
.poweroff = snd_soc_poweroff, .poweroff = snd_soc_poweroff,
.restore = snd_soc_resume, .restore = snd_soc_resume,
}; };
static struct platform_driver mt8192_mt6359_rt1015_rt5682_driver = { static struct platform_driver mt8192_mt6359_driver = {
.driver = { .driver = {
.name = "mt8192_mt6359_rt1015_rt5682", .name = "mt8192_mt6359",
#ifdef CONFIG_OF #ifdef CONFIG_OF
.of_match_table = mt8192_mt6359_rt1015_rt5682_dt_match, .of_match_table = mt8192_mt6359_dt_match,
#endif #endif
.pm = &mt8192_mt6359_rt1015_rt5682_pm_ops, .pm = &mt8192_mt6359_pm_ops,
}, },
.probe = mt8192_mt6359_rt1015_rt5682_dev_probe, .probe = mt8192_mt6359_dev_probe,
}; };
module_platform_driver(mt8192_mt6359_rt1015_rt5682_driver); module_platform_driver(mt8192_mt6359_driver);
/* Module information */ /* Module information */
MODULE_DESCRIPTION("MT8192-MT6359-RT1015-RT5682 ALSA SoC machine driver"); MODULE_DESCRIPTION("MT8192-MT6359 ALSA SoC machine driver");
MODULE_AUTHOR("Jiaxin Yu <jiaxin.yu@mediatek.com>"); MODULE_AUTHOR("Jiaxin Yu <jiaxin.yu@mediatek.com>");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_ALIAS("mt8192_mt6359_rt1015_rt5682 soc card"); MODULE_ALIAS("mt8192_mt6359 soc card");