From nobody Sat Sep 21 20:14:51 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF966C38145 for ; Thu, 8 Sep 2022 16:12:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231828AbiIHQMT (ORCPT ); Thu, 8 Sep 2022 12:12:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230220AbiIHQMH (ORCPT ); Thu, 8 Sep 2022 12:12:07 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C486E5580 for ; Thu, 8 Sep 2022 09:12:06 -0700 (PDT) Received: from notapiano.myfiosgateway.com (unknown [70.107.189.129]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nfraprado) by madras.collabora.co.uk (Postfix) with ESMTPSA id 3BB776601FAE; Thu, 8 Sep 2022 17:12:04 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1662653525; bh=xEF1CQNN9sntlz4PLeIKwVS7wPU/B5aUiicOkcoBGNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QXzUjpATw+vcXLt0B57A1UD38hGGFrLsbi95cKwhFYv3CQXtwc9z5UYGoAk7R3PQm +aOQYa5FmFd/ZPJQxPkX8zzaoLUmPWnM2Ug6OpNeg3uGC/tMJsiD+t4+5785ji7krJ PL61L7za3JIHWSPBXc6MHI2FXEPftMtfPUDdJLIUEsl0aSgT9cCFsJkes4LWxIkMcN n927BxS+qUE8l9+MUb8VjVSX/AGhEuEi8nUhs7+EblODXeJmLF8orSUZTSjJBsmHOh X8v/Vz9NKqibPmFBXHT6TAyjaZTT2VoZPA+116upf1o3NWenVJ3Pt7DiZALn0LtU3T JGnXnqOuh+ItQ== From: =?UTF-8?q?N=C3=ADcolas=20F=2E=20R=2E=20A=2E=20Prado?= To: Mark Brown , Matthias Brugger Cc: kernel@collabora.com, AngeloGioacchino Del Regno , =?UTF-8?q?N=C3=ADcolas=20F=2E=20R=2E=20A=2E=20Prado?= , Jaroslav Kysela , Liam Girdwood , Takashi Iwai , 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 Message-Id: <20220908161154.648557-4-nfraprado@collabora.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220908161154.648557-1-nfraprado@collabora.com> References: <20220908161154.648557-1-nfraprado@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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=C3=ADcolas F. R. A. Prado --- 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/mediate= k/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; =20 - const char *share_property_name; int share_i2s_id; =20 int mclk_id; @@ -1984,79 +1983,50 @@ static const struct mtk_afe_i2s_priv mt8192_i2s_pri= v[DAI_I2S_NUM] =3D { [DAI_I2S0] =3D { .id =3D MT8192_DAI_I2S_0, .mclk_id =3D MT8192_I2S0_MCK, - .share_property_name =3D "i2s0-share", .share_i2s_id =3D -1, }, [DAI_I2S1] =3D { .id =3D MT8192_DAI_I2S_1, .mclk_id =3D MT8192_I2S1_MCK, - .share_property_name =3D "i2s1-share", .share_i2s_id =3D -1, }, [DAI_I2S2] =3D { .id =3D MT8192_DAI_I2S_2, .mclk_id =3D MT8192_I2S2_MCK, - .share_property_name =3D "i2s2-share", .share_i2s_id =3D -1, }, [DAI_I2S3] =3D { .id =3D MT8192_DAI_I2S_3, .mclk_id =3D MT8192_I2S3_MCK, - .share_property_name =3D "i2s3-share", .share_i2s_id =3D -1, }, [DAI_I2S5] =3D { .id =3D MT8192_DAI_I2S_5, .mclk_id =3D MT8192_I2S5_MCK, - .share_property_name =3D "i2s5-share", .share_i2s_id =3D -1, }, [DAI_I2S6] =3D { .id =3D MT8192_DAI_I2S_6, .mclk_id =3D MT8192_I2S6_MCK, - .share_property_name =3D "i2s6-share", .share_i2s_id =3D -1, }, [DAI_I2S7] =3D { .id =3D MT8192_DAI_I2S_7, .mclk_id =3D MT8192_I2S7_MCK, - .share_property_name =3D "i2s7-share", .share_i2s_id =3D -1, }, [DAI_I2S8] =3D { .id =3D MT8192_DAI_I2S_8, .mclk_id =3D MT8192_I2S8_MCK, - .share_property_name =3D "i2s8-share", .share_i2s_id =3D -1, }, [DAI_I2S9] =3D { .id =3D MT8192_DAI_I2S_9, .mclk_id =3D MT8192_I2S9_MCK, - .share_property_name =3D "i2s9-share", .share_i2s_id =3D -1, }, }; =20 -static int mt8192_dai_i2s_get_share(struct mtk_base_afe *afe) -{ - struct mt8192_afe_private *afe_priv =3D afe->platform_priv; - const struct device_node *of_node =3D afe->dev->of_node; - const char *of_str; - const char *property_name; - struct mtk_afe_i2s_priv *i2s_priv; - int i; - - for (i =3D 0; i < DAI_I2S_NUM; i++) { - i2s_priv =3D afe_priv->dai_priv[mt8192_i2s_priv[i].id]; - property_name =3D mt8192_i2s_priv[i].share_property_name; - if (of_property_read_string(of_node, property_name, &of_str)) - continue; - i2s_priv->share_i2s_id =3D 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; =20 - /* parse share i2s */ - ret =3D mt8192_dai_i2s_get_share(afe); - if (ret) - return ret; - return 0; } --=20 2.37.3