From: Tzung-Bi Shih <tzungbi@google.com>
To: broonie@kernel.org, robh+dt@kernel.org
Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
tzungbi@google.com
Subject: [RESEND PATCH 1/6] ASoC: mediatek: mt8192: rename common symbols
Date: Tue, 1 Dec 2020 21:26:09 +0800 [thread overview]
Message-ID: <20201201132614.1691352-2-tzungbi@google.com> (raw)
In-Reply-To: <20201201132614.1691352-1-tzungbi@google.com>
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>
---
.../mt8192/mt8192-mt6359-rt1015-rt5682.c | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
index b7f42a530d06..253c028c1630 100644
--- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
+++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
@@ -631,7 +631,7 @@ SND_SOC_DAILINK_DEFS(tdm,
DAILINK_COMP_ARRAY(COMP_DUMMY()),
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 */
{
.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 = {
.name = "mt8192_mt6359_rt1015_rt5682",
.owner = THIS_MODULE,
- .dai_link = mt8192_mt6359_rt1015_rt5682_dai_links,
- .num_links = ARRAY_SIZE(mt8192_mt6359_rt1015_rt5682_dai_links),
+ .dai_link = mt8192_mt6359_dai_links,
+ .num_links = ARRAY_SIZE(mt8192_mt6359_dai_links),
.controls = mt8192_mt6359_rt1015_rt5682_controls,
.num_controls = ARRAY_SIZE(mt8192_mt6359_rt1015_rt5682_controls),
.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),
};
-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 device_node *platform_node;
@@ -1029,32 +1029,32 @@ static int mt8192_mt6359_rt1015_rt5682_dev_probe(struct platform_device *pdev)
}
#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",},
{}
};
#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,
.restore = snd_soc_resume,
};
-static struct platform_driver mt8192_mt6359_rt1015_rt5682_driver = {
+static struct platform_driver mt8192_mt6359_driver = {
.driver = {
- .name = "mt8192_mt6359_rt1015_rt5682",
+ .name = "mt8192_mt6359",
#ifdef CONFIG_OF
- .of_match_table = mt8192_mt6359_rt1015_rt5682_dt_match,
+ .of_match_table = mt8192_mt6359_dt_match,
#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_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_LICENSE("GPL v2");
-MODULE_ALIAS("mt8192_mt6359_rt1015_rt5682 soc card");
+MODULE_ALIAS("mt8192_mt6359 soc card");
--
2.29.2.454.gaff20da3a2-goog
next prev parent reply other threads:[~2020-12-01 13:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 13:26 [RESEND PATCH 0/6] ASoC: mediatek: mt8192: support new machine rt1015p_rt5682 Tzung-Bi Shih
2020-12-01 13:26 ` Tzung-Bi Shih [this message]
2020-12-01 13:26 ` [RESEND PATCH 2/6] ASoC: mediatek: mt8192: extract rt1015_rt5682 specific DAI link Tzung-Bi Shih
2020-12-01 13:26 ` [RESEND PATCH 3/6] ASoC: mediatek: mt8192: move rt1015_rt5682 specific data Tzung-Bi Shih
2020-12-01 13:26 ` [RESEND PATCH 4/6] ASoC: dt-bindings: mt8192-mt6359: fix typo in the example Tzung-Bi Shih
2020-12-01 13:26 ` [RESEND PATCH 5/6] ASoC: dt-bindings: mt8192-mt6359: add new compatible for using rt1015p Tzung-Bi Shih
2020-12-01 13:26 ` [RESEND PATCH 6/6] ASoC: mediatek: mt8192: support rt1015p_rt5682 Tzung-Bi Shih
2020-12-02 17:19 ` [RESEND PATCH 0/6] ASoC: mediatek: mt8192: support new machine rt1015p_rt5682 Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201201132614.1691352-2-tzungbi@google.com \
--to=tzungbi@google.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).