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 2/6] ASoC: mediatek: mt8192: extract rt1015_rt5682 specific DAI link
Date: Tue, 1 Dec 2020 21:26:10 +0800 [thread overview]
Message-ID: <20201201132614.1691352-3-tzungbi@google.com> (raw)
In-Reply-To: <20201201132614.1691352-1-tzungbi@google.com>
Extracts rt1015_rt5682 specific DAI link from the common one. Fills the
DAI link data according to of_match.
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
.../mt8192/mt8192-mt6359-rt1015-rt5682.c | 39 +++++++++++++++----
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
index 253c028c1630..e841fd32e8cc 100644
--- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
+++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
@@ -9,6 +9,7 @@
#include <linux/input.h>
#include <linux/module.h>
+#include <linux/of_device.h>
#include <linux/pm_runtime.h>
#include <sound/jack.h>
#include <sound/pcm_params.h>
@@ -576,7 +577,7 @@ SND_SOC_DAILINK_DEFS(i2s2,
DAILINK_COMP_ARRAY(COMP_DUMMY()),
DAILINK_COMP_ARRAY(COMP_EMPTY()));
-SND_SOC_DAILINK_DEFS(i2s3,
+SND_SOC_DAILINK_DEFS(i2s3_rt1015,
DAILINK_COMP_ARRAY(COMP_CPU("I2S3")),
DAILINK_COMP_ARRAY(COMP_CODEC(RT1015_DEV0_NAME,
RT1015_CODEC_DAI),
@@ -894,8 +895,6 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
.dpcm_playback = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
- SND_SOC_DAILINK_REG(i2s3),
- .ops = &mt8192_rt1015_i2s_ops,
},
{
.name = "I2S5",
@@ -983,7 +982,7 @@ 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_card = {
.name = "mt8192_mt6359_rt1015_rt5682",
.owner = THIS_MODULE,
.dai_link = mt8192_mt6359_dai_links,
@@ -1000,12 +999,11 @@ static struct snd_soc_card mt8192_mt6359_rt1015_rt5682_soc_card = {
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;
struct device_node *platform_node;
int ret, i;
struct snd_soc_dai_link *dai_link;
-
- card->dev = &pdev->dev;
+ const struct of_device_id *match;
platform_node = of_parse_phandle(pdev->dev.of_node,
"mediatek,platform", 0);
@@ -1014,7 +1012,29 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
return -EINVAL;
}
+ match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev);
+ if (!match || !match->data)
+ return -EINVAL;
+
+ card = (struct snd_soc_card *)match->data;
+ card->dev = &pdev->dev;
+
for_each_card_prelinks(card, i, dai_link) {
+ if (strcmp(dai_link->name, "I2S3") == 0) {
+ if (card == &mt8192_mt6359_rt1015_rt5682_card) {
+ dai_link->ops = &mt8192_rt1015_i2s_ops;
+ dai_link->cpus = i2s3_rt1015_cpus;
+ dai_link->num_cpus =
+ ARRAY_SIZE(i2s3_rt1015_cpus);
+ dai_link->codecs = i2s3_rt1015_codecs;
+ dai_link->num_codecs =
+ ARRAY_SIZE(i2s3_rt1015_codecs);
+ dai_link->platforms = i2s3_rt1015_platforms;
+ dai_link->num_platforms =
+ ARRAY_SIZE(i2s3_rt1015_platforms);
+ }
+ }
+
if (!dai_link->platforms->name)
dai_link->platforms->of_node = platform_node;
}
@@ -1030,7 +1050,10 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
#ifdef CONFIG_OF
static const struct of_device_id mt8192_mt6359_dt_match[] = {
- {.compatible = "mediatek,mt8192_mt6359_rt1015_rt5682",},
+ {
+ .compatible = "mediatek,mt8192_mt6359_rt1015_rt5682",
+ .data = &mt8192_mt6359_rt1015_rt5682_card,
+ },
{}
};
#endif
--
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 ` [RESEND PATCH 1/6] ASoC: mediatek: mt8192: rename common symbols Tzung-Bi Shih
2020-12-01 13:26 ` Tzung-Bi Shih [this message]
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-3-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).