| Message ID | 20230523021933.3422-5-trevor.wu@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: mt8188: add new board support | expand |
On 23/05/2023 04:19, Trevor Wu wrote: > There are two changes included in the patch. > > First, add set_dailink_daifmt() function, so dai_fmt can be updated by > the configuration in dai-link sub node. > > Second, remove codec phandle from required property in dai-link sub node. > For example, user possibly needs to update dai-format for all etdm > co-clock dai-links, but codec doesn't need to be specified in capture > dai-link for a speaker amp. > > Signed-off-by: Trevor Wu <trevor.wu@mediatek.com> > --- > .../mediatek/common/mtk-soundcard-driver.c | 49 ++++++++++++++++++- > 1 file changed, 48 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/mediatek/common/mtk-soundcard-driver.c b/sound/soc/mediatek/common/mtk-soundcard-driver.c > index 738093451ccb..5e291092046b 100644 > --- a/sound/soc/mediatek/common/mtk-soundcard-driver.c > +++ b/sound/soc/mediatek/common/mtk-soundcard-driver.c > @@ -22,7 +22,7 @@ static int set_card_codec_info(struct snd_soc_card *card, > > codec_node = of_get_child_by_name(sub_node, "codec"); > if (!codec_node) > - return -EINVAL; IMO, the debug or info print should be welcome here because the behavior change: dai link info parse will not stop if the codec node is NULL. That could help to understand what is happening during init. Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
On Wed, 2023-05-24 at 16:12 +0200, Alexandre Mergnat wrote: > On 23/05/2023 04:19, Trevor Wu wrote: > > There are two changes included in the patch. > > > > First, add set_dailink_daifmt() function, so dai_fmt can be updated > > by > > the configuration in dai-link sub node. > > > > Second, remove codec phandle from required property in dai-link sub > > node. > > For example, user possibly needs to update dai-format for all etdm > > co-clock dai-links, but codec doesn't need to be specified in > > capture > > dai-link for a speaker amp. > > > > Signed-off-by: Trevor Wu <trevor.wu@mediatek.com> > > --- > > .../mediatek/common/mtk-soundcard-driver.c | 49 > > ++++++++++++++++++- > > 1 file changed, 48 insertions(+), 1 deletion(-) > > > > diff --git a/sound/soc/mediatek/common/mtk-soundcard-driver.c > > b/sound/soc/mediatek/common/mtk-soundcard-driver.c > > index 738093451ccb..5e291092046b 100644 > > --- a/sound/soc/mediatek/common/mtk-soundcard-driver.c > > +++ b/sound/soc/mediatek/common/mtk-soundcard-driver.c > > @@ -22,7 +22,7 @@ static int set_card_codec_info(struct > > snd_soc_card *card, > > > > codec_node = of_get_child_by_name(sub_node, "codec"); > > if (!codec_node) > > - return -EINVAL; > > IMO, the debug or info print should be welcome here because the > behavior > change: dai link info parse will not stop if the codec node is NULL. > That could help to understand what is happening during init. > > > > Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com> > Thanks for your suggestion. I will add a debug message here. Thanks, Trevor
diff --git a/sound/soc/mediatek/common/mtk-soundcard-driver.c b/sound/soc/mediatek/common/mtk-soundcard-driver.c index 738093451ccb..5e291092046b 100644 --- a/sound/soc/mediatek/common/mtk-soundcard-driver.c +++ b/sound/soc/mediatek/common/mtk-soundcard-driver.c @@ -22,7 +22,7 @@ static int set_card_codec_info(struct snd_soc_card *card, codec_node = of_get_child_by_name(sub_node, "codec"); if (!codec_node) - return -EINVAL; + return 0; /* set card codec info */ ret = snd_soc_of_get_dai_link_codecs(dev, codec_node, dai_link); @@ -36,6 +36,47 @@ static int set_card_codec_info(struct snd_soc_card *card, return 0; } +static int set_dailink_daifmt(struct snd_soc_card *card, + struct device_node *sub_node, + struct snd_soc_dai_link *dai_link) +{ + unsigned int daifmt; + const char *str; + int ret; + struct { + char *name; + unsigned int val; + } of_clk_table[] = { + { "cpu", SND_SOC_DAIFMT_CBC_CFC }, + { "codec", SND_SOC_DAIFMT_CBP_CFP }, + }; + + daifmt = snd_soc_daifmt_parse_format(sub_node, NULL); + if (daifmt) { + dai_link->dai_fmt &= SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK; + dai_link->dai_fmt |= daifmt; + } + + /* + * check "mediatek,clk-provider = xxx" + * SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK area + */ + ret = of_property_read_string(sub_node, "mediatek,clk-provider", &str); + if (ret == 0) { + int i; + + for (i = 0; i < ARRAY_SIZE(of_clk_table); i++) { + if (strcmp(str, of_clk_table[i].name) == 0) { + dai_link->dai_fmt &= ~SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK; + dai_link->dai_fmt |= of_clk_table[i].val; + break; + } + } + } + + return 0; +} + int parse_dai_link_info(struct snd_soc_card *card) { struct device *dev = card->dev; @@ -67,6 +108,12 @@ int parse_dai_link_info(struct snd_soc_card *card) of_node_put(sub_node); return ret; } + + ret = set_dailink_daifmt(card, sub_node, dai_link); + if (ret < 0) { + of_node_put(sub_node); + return ret; + } } return 0;
There are two changes included in the patch. First, add set_dailink_daifmt() function, so dai_fmt can be updated by the configuration in dai-link sub node. Second, remove codec phandle from required property in dai-link sub node. For example, user possibly needs to update dai-format for all etdm co-clock dai-links, but codec doesn't need to be specified in capture dai-link for a speaker amp. Signed-off-by: Trevor Wu <trevor.wu@mediatek.com> --- .../mediatek/common/mtk-soundcard-driver.c | 49 ++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-)