From nobody Tue Feb 10 04:32:55 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E632238171; Mon, 26 Jan 2026 06:02:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769407329; cv=none; b=mMcmo5RQaPkipHktTKxwpe/2NIp6T8c8ZjLPwXpGS4wKb4/eXleZaFxRL1UIzzVACjOeidS95Cld+3XKdPpTIlewqwi4vsRbATY0JcIa4i6Tt5bWwRQELyhbV+M9ucv89PZV3kUuQxOSD/Ij6Tzm2kdbOeyBzMs5DK+245LXnZM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769407329; c=relaxed/simple; bh=W2sMfoYB0cv3opAU6LY6NxfaodLpNuCuA6v8AZ390J0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RxVZjY9OKnsuemK7qi5HQrEtoe8KL0wi+o0uWC6ca0ieGsIi4/HraZW3a29KgErW27g0QaagJvFkuUlob9FujXBvS5ygnP+ZPdiwSyYfXyuZH9YA0MJ1itQW365WoQCUhBfU5ZBwaRwGLIKYo4d+2IDl6lAPTqiq/N2nVa6PQqA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=srChx7Ib; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="srChx7Ib" Received: by smtp.kernel.org (Postfix) with ESMTPS id DFF2CC2BCB2; Mon, 26 Jan 2026 06:02:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769407329; bh=W2sMfoYB0cv3opAU6LY6NxfaodLpNuCuA6v8AZ390J0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=srChx7Ibbh3nSrj0Hk0bPCnwQT/yaiw2fCbXiA4gMF9x+Qlg2TmMvVrKL6TxXO+zY oUeKeAUg2nOcJ9mO5LpN/yG+7PdrTwfa2ga3g/sGI7T7yEVvSKsnMAbjGxQ7aY9teD uqAntupK7wY4x1/EO/bwPU82+jtWq1LlwQYaX+mwS8VyVVUCd8Xb52rbt06hmxQ++F XQ7DZZ8+Oy5COWN/4ZhBy9cg3qc60k3Jp3OeOXMp1UiimD9yIfKMS7kqj5k5Q6xiPU wiTnQ92P47pOGCuQGuDZ10ntEoV2dpYhbgnujI5TZWOwOamo3bliEre3sYeCm85/SR uLgQHCJcPwzeA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5899C88E42; Mon, 26 Jan 2026 06:02:08 +0000 (UTC) From: Jiebing Chen via B4 Relay Date: Mon, 26 Jan 2026 06:01:44 +0000 Subject: [PATCH v6 3/5] ASoC: meson: g12a-toacodec: Add S4 tocodec driver Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260126-audio_drvier-v6-3-99e350855bc2@amlogic.com> References: <20260126-audio_drvier-v6-0-99e350855bc2@amlogic.com> In-Reply-To: <20260126-audio_drvier-v6-0-99e350855bc2@amlogic.com> To: Jerome Brunet , Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Neil Armstrong , Kevin Hilman , Martin Blumenstingl , Michael Turquette , Stephen Boyd Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, jian.xu@amlogic.com, shuai.li@amlogic.com, zhe.wang@amlogic.com, jiebing chen X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1769407326; l=3394; i=jiebing.chen@amlogic.com; s=20250110; h=from:subject:message-id; bh=fK4/vGW475a55eAlmHfX9R+Xlh0VKjf26MRZxqH0K8o=; b=X2wYzsr0AapLWCUnVhTuFUxlemajlmQX++FzS3QhDO8yQXOK7lzcZUfAwidrQgznXcQCpqNTl 5CrCBhtOM6ADv27v1H/hOYOmp6aRQH+Co3tllL0ZbpgsME9PdF0fT9U X-Developer-Key: i=jiebing.chen@amlogic.com; a=ed25519; pk=6rFvvF45A84pLNRy03hfUHeROxHCnZ+1KAGw/DoqKic= X-Endpoint-Received: by B4 Relay for jiebing.chen@amlogic.com/20250110 with auth_id=316 X-Original-From: Jiebing Chen Reply-To: jiebing.chen@amlogic.com From: Jiebing Chen The S4 requires additional clock control bits to be turn on while enabled. The S4 has 8 TDM lanes, instead of 4 on previous SoC. Update the widget accordingly. Signed-off-by: Jiebing Chen --- sound/soc/meson/g12a-toacodec.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/sound/soc/meson/g12a-toacodec.c b/sound/soc/meson/g12a-toacode= c.c index a95375b53f0a..a7f9ac2d08f7 100644 --- a/sound/soc/meson/g12a-toacodec.c +++ b/sound/soc/meson/g12a-toacodec.c @@ -41,6 +41,9 @@ #define CTRL0_BCLK_SEL_LSB 4 #define CTRL0_MCLK_SEL GENMASK(2, 0) =20 +#define CTRL0_BCLK_ENABLE_SHIFT 30 +#define CTRL0_MCLK_ENABLE_SHIFT 29 + #define TOACODEC_OUT_CHMAX 2 =20 struct g12a_toacodec { @@ -141,6 +144,13 @@ static const struct snd_soc_dapm_widget sm1_toacodec_w= idgets[] =3D { &g12a_toacodec_out_enable), }; =20 +static const struct snd_soc_dapm_widget s4_toacodec_widgets[] =3D { + SND_SOC_DAPM_MUX("SRC", TOACODEC_CTRL0, CTRL0_BCLK_ENABLE_SHIFT, 0, + &sm1_toacodec_mux), + SND_SOC_DAPM_SWITCH("OUT EN", TOACODEC_CTRL0, CTRL0_MCLK_ENABLE_SHIFT, 0, + &g12a_toacodec_out_enable), +}; + static int g12a_toacodec_input_hw_params(struct snd_pcm_substream *substre= am, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) @@ -234,6 +244,10 @@ static const struct snd_kcontrol_new sm1_toacodec_cont= rols[] =3D { SOC_SINGLE("Lane Select", TOACODEC_CTRL0, CTRL0_LANE_SEL_SM1, 3, 0), }; =20 +static const struct snd_kcontrol_new s4_toacodec_controls[] =3D { + SOC_SINGLE("Lane Select", TOACODEC_CTRL0, CTRL0_LANE_SEL_SM1, 7, 0), +}; + static const struct snd_soc_component_driver g12a_toacodec_component_drv = =3D { .probe =3D g12a_toacodec_component_probe, .controls =3D g12a_toacodec_controls, @@ -256,6 +270,17 @@ static const struct snd_soc_component_driver sm1_toaco= dec_component_drv =3D { .endianness =3D 1, }; =20 +static const struct snd_soc_component_driver s4_toacodec_component_drv =3D= { + .probe =3D sm1_toacodec_component_probe, + .controls =3D s4_toacodec_controls, + .num_controls =3D ARRAY_SIZE(s4_toacodec_controls), + .dapm_widgets =3D s4_toacodec_widgets, + .num_dapm_widgets =3D ARRAY_SIZE(s4_toacodec_widgets), + .dapm_routes =3D g12a_toacodec_routes, + .num_dapm_routes =3D ARRAY_SIZE(g12a_toacodec_routes), + .endianness =3D 1, +}; + static const struct regmap_config g12a_toacodec_regmap_cfg =3D { .reg_bits =3D 32, .val_bits =3D 32, @@ -276,6 +301,13 @@ static const struct g12a_toacodec_match_data sm1_toaco= dec_match_data =3D { .field_bclk_sel =3D REG_FIELD(TOACODEC_CTRL0, 4, 6), }; =20 +static const struct g12a_toacodec_match_data s4_toacodec_match_data =3D { + .component_drv =3D &s4_toacodec_component_drv, + .field_dat_sel =3D REG_FIELD(TOACODEC_CTRL0, 19, 20), + .field_lrclk_sel =3D REG_FIELD(TOACODEC_CTRL0, 12, 14), + .field_bclk_sel =3D REG_FIELD(TOACODEC_CTRL0, 4, 6), +}; + static const struct of_device_id g12a_toacodec_of_match[] =3D { { .compatible =3D "amlogic,g12a-toacodec", @@ -285,6 +317,10 @@ static const struct of_device_id g12a_toacodec_of_matc= h[] =3D { .compatible =3D "amlogic,sm1-toacodec", .data =3D &sm1_toacodec_match_data, }, + { + .compatible =3D "amlogic,s4-toacodec", + .data =3D &s4_toacodec_match_data, + }, {} }; MODULE_DEVICE_TABLE(of, g12a_toacodec_of_match); --=20 2.52.0