Skip to content

Commit

Permalink
ASoC: mediatek: mt8186: Remove clock share parsing from DT
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Mark Brown <[email protected]>
  • Loading branch information
nfraprado authored and broonie committed Sep 9, 2022
1 parent 9986bda commit 62da80c
Showing 1 changed file with 0 additions and 30 deletions.
30 changes: 0 additions & 30 deletions sound/soc/mediatek/mt8186/mt8186-dai-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ struct mtk_afe_i2s_priv {
int low_jitter_en;
int master; /* only i2s0 has slave mode*/

const char *share_property_name;
int share_i2s_id;

int mclk_id;
Expand Down Expand Up @@ -1140,50 +1139,26 @@ static const struct mtk_afe_i2s_priv mt8186_i2s_priv[DAI_I2S_NUM] = {
[DAI_I2S0] = {
.id = MT8186_DAI_I2S_0,
.mclk_id = MT8186_I2S0_MCK,
.share_property_name = "i2s0-share",
.share_i2s_id = -1,
},
[DAI_I2S1] = {
.id = MT8186_DAI_I2S_1,
.mclk_id = MT8186_I2S1_MCK,
.share_property_name = "i2s1-share",
.share_i2s_id = -1,
},
[DAI_I2S2] = {
.id = MT8186_DAI_I2S_2,
.mclk_id = MT8186_I2S2_MCK,
.share_property_name = "i2s2-share",
.share_i2s_id = -1,
},
[DAI_I2S3] = {
.id = MT8186_DAI_I2S_3,
/* clock gate naming is hf_faud_i2s4_m_ck*/
.mclk_id = MT8186_I2S4_MCK,
.share_property_name = "i2s3-share",
.share_i2s_id = -1,
}
};

static int mt8186_dai_i2s_get_share(struct mtk_base_afe *afe)
{
struct mt8186_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[mt8186_i2s_priv[i].id];
property_name = mt8186_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;
}

/**
* mt8186_dai_i2s_set_share() - Set up I2S ports to share a single clock.
* @afe: Pointer to &struct mtk_base_afe
Expand Down Expand Up @@ -1252,10 +1227,5 @@ int mt8186_dai_i2s_register(struct mtk_base_afe *afe)
if (ret)
return ret;

/* parse share i2s */
ret = mt8186_dai_i2s_get_share(afe);
if (ret)
return ret;

return 0;
}

0 comments on commit 62da80c

Please sign in to comment.