Linux-mediatek Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Nícolas F. R. A. Prado" <nfraprado@collabora.com>
To: Mark Brown <broonie@kernel.org>,
	Matthias Brugger <matthias.bgg@gmail.com>
Cc: kernel@collabora.com,
	"AngeloGioacchino Del Regno"
	<angelogioacchino.delregno@collabora.com>,
	"Nícolas F. R. A. Prado" <nfraprado@collabora.com>,
	"Jaroslav Kysela" <perex@perex.cz>,
	"Liam Girdwood" <lgirdwood@gmail.com>,
	"Takashi Iwai" <tiwai@suse.com>,
	alsa-devel@alsa-project.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org
Subject: [PATCH 03/10] ASoC: mediatek: mt8192: Remove clock share parsing from DT
Date: Thu,  8 Sep 2022 12:11:47 -0400	[thread overview]
Message-ID: <20220908161154.648557-4-nfraprado@collabora.com> (raw)
In-Reply-To: <20220908161154.648557-1-nfraprado@collabora.com>

Now that the clock sharing for i2s ports can be configured from the
sound machine driver, remove the logic that was used to parse the
properties from the devicetree.

Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
---

 sound/soc/mediatek/mt8192/mt8192-dai-i2s.c | 35 ----------------------
 1 file changed, 35 deletions(-)

diff --git a/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c b/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c
index 630ed7261fc3..ea516d63d94d 100644
--- a/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c
+++ b/sound/soc/mediatek/mt8192/mt8192-dai-i2s.c
@@ -45,7 +45,6 @@ struct mtk_afe_i2s_priv {
 	int rate; /* for determine which apll to use */
 	int low_jitter_en;
 
-	const char *share_property_name;
 	int share_i2s_id;
 
 	int mclk_id;
@@ -1984,79 +1983,50 @@ static const struct mtk_afe_i2s_priv mt8192_i2s_priv[DAI_I2S_NUM] = {
 	[DAI_I2S0] = {
 		.id = MT8192_DAI_I2S_0,
 		.mclk_id = MT8192_I2S0_MCK,
-		.share_property_name = "i2s0-share",
 		.share_i2s_id = -1,
 	},
 	[DAI_I2S1] = {
 		.id = MT8192_DAI_I2S_1,
 		.mclk_id = MT8192_I2S1_MCK,
-		.share_property_name = "i2s1-share",
 		.share_i2s_id = -1,
 	},
 	[DAI_I2S2] = {
 		.id = MT8192_DAI_I2S_2,
 		.mclk_id = MT8192_I2S2_MCK,
-		.share_property_name = "i2s2-share",
 		.share_i2s_id = -1,
 	},
 	[DAI_I2S3] = {
 		.id = MT8192_DAI_I2S_3,
 		.mclk_id = MT8192_I2S3_MCK,
-		.share_property_name = "i2s3-share",
 		.share_i2s_id = -1,
 	},
 	[DAI_I2S5] = {
 		.id = MT8192_DAI_I2S_5,
 		.mclk_id = MT8192_I2S5_MCK,
-		.share_property_name = "i2s5-share",
 		.share_i2s_id = -1,
 	},
 	[DAI_I2S6] = {
 		.id = MT8192_DAI_I2S_6,
 		.mclk_id = MT8192_I2S6_MCK,
-		.share_property_name = "i2s6-share",
 		.share_i2s_id = -1,
 	},
 	[DAI_I2S7] = {
 		.id = MT8192_DAI_I2S_7,
 		.mclk_id = MT8192_I2S7_MCK,
-		.share_property_name = "i2s7-share",
 		.share_i2s_id = -1,
 	},
 	[DAI_I2S8] = {
 		.id = MT8192_DAI_I2S_8,
 		.mclk_id = MT8192_I2S8_MCK,
-		.share_property_name = "i2s8-share",
 		.share_i2s_id = -1,
 	},
 	[DAI_I2S9] = {
 		.id = MT8192_DAI_I2S_9,
 		.mclk_id = MT8192_I2S9_MCK,
-		.share_property_name = "i2s9-share",
 		.share_i2s_id = -1,
 	},
 };
 
-static int mt8192_dai_i2s_get_share(struct mtk_base_afe *afe)
-{
-	struct mt8192_afe_private *afe_priv = afe->platform_priv;
-	const struct device_node *of_node = afe->dev->of_node;
-	const char *of_str;
-	const char *property_name;
-	struct mtk_afe_i2s_priv *i2s_priv;
-	int i;
-
-	for (i = 0; i < DAI_I2S_NUM; i++) {
-		i2s_priv = afe_priv->dai_priv[mt8192_i2s_priv[i].id];
-		property_name = mt8192_i2s_priv[i].share_property_name;
-		if (of_property_read_string(of_node, property_name, &of_str))
-			continue;
-		i2s_priv->share_i2s_id = get_i2s_id_by_name(afe, of_str);
-	}
-
-	return 0;
-}
-
 /**
  * mt8192_dai_i2s_set_share() - Set up I2S ports to share a single clock.
  * @afe: Pointer to &struct mtk_base_afe
@@ -2127,10 +2097,5 @@ int mt8192_dai_i2s_register(struct mtk_base_afe *afe)
 	if (ret)
 		return ret;
 
-	/* parse share i2s */
-	ret = mt8192_dai_i2s_get_share(afe);
-	if (ret)
-		return ret;
-
 	return 0;
 }
-- 
2.37.3



  parent reply	other threads:[~2022-09-08 16:13 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-08 16:11 [PATCH 00/10] ASoC: mediatek: Set i2s clock sharing from machine drivers Nícolas F. R. A. Prado
2022-09-08 16:11 ` [PATCH 01/10] ASoC: mediatek: mt8192: Allow setting shared clocks from machine driver Nícolas F. R. A. Prado
2022-09-09  7:34   ` AngeloGioacchino Del Regno
2022-09-08 16:11 ` [PATCH 02/10] ASoC: mediatek: mt8192-mt6359: Make i2s9 share the clock from i2s8 Nícolas F. R. A. Prado
2022-09-09  7:34   ` AngeloGioacchino Del Regno
2022-09-08 16:11 ` Nícolas F. R. A. Prado [this message]
2022-09-09  7:34   ` [PATCH 03/10] ASoC: mediatek: mt8192: Remove clock share parsing from DT AngeloGioacchino Del Regno
2022-09-08 16:11 ` [PATCH 04/10] ASoC: mediatek: mt8183: Allow setting shared clocks from machine driver Nícolas F. R. A. Prado
2022-09-09  7:34   ` AngeloGioacchino Del Regno
2022-09-08 16:11 ` [PATCH 05/10] ASoC: mediatek: mt8183: Configure shared clocks Nícolas F. R. A. Prado
2022-09-09  7:34   ` AngeloGioacchino Del Regno
2022-09-08 16:11 ` [PATCH 06/10] ASoC: mediatek: mt8183: Remove clock share parsing from DT Nícolas F. R. A. Prado
2022-09-09  7:34   ` AngeloGioacchino Del Regno
2022-09-08 16:11 ` [PATCH 07/10] arm64: dts: mediatek: kukui: Remove i2s-share properties Nícolas F. R. A. Prado
2022-09-09  7:34   ` AngeloGioacchino Del Regno
2022-11-08 12:43   ` Matthias Brugger
2022-09-08 16:11 ` [PATCH 08/10] ASoC: mediatek: mt8186: Allow setting shared clocks from machine driver Nícolas F. R. A. Prado
2022-09-09  7:34   ` AngeloGioacchino Del Regno
2022-09-08 16:11 ` [PATCH 09/10] ASoC: mediatek: mt8186: Configure shared clocks Nícolas F. R. A. Prado
2022-09-09  7:34   ` AngeloGioacchino Del Regno
2022-09-08 16:11 ` [PATCH 10/10] ASoC: mediatek: mt8186: Remove clock share parsing from DT Nícolas F. R. A. Prado
2022-09-09  7:34   ` AngeloGioacchino Del Regno
2022-09-09 22:45 ` [PATCH 00/10] ASoC: mediatek: Set i2s clock sharing from machine drivers Mark Brown
2022-09-13 15:56   ` Matthias Brugger
2022-09-13 16:07     ` Mark Brown
2022-09-13 16:12 ` 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=20220908161154.648557-4-nfraprado@collabora.com \
    --to=nfraprado@collabora.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=angelogioacchino.delregno@collabora.com \
    --cc=broonie@kernel.org \
    --cc=kernel@collabora.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=matthias.bgg@gmail.com \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    /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