From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CEF99CAC5A5 for ; Wed, 24 Sep 2025 13:08:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=pL2uoqzypHbRpbvTBPNzb3YECUS6GHGmBJvJaUK0ytc=; b=uZFeniUXviJRzJeUscFgCRXsUI Xbj3fxobt5z/7vuUCEdocPuKMKyHlUkxi34IEKb80C0XphFzGcRHE5eLXerTrdN5/khWFrbRri6R6 Pid9lnw7d5+A13j9oc5rLDpHl67LyxfQE0YTSEf2YfwITHuplkBPEHjrsEqryh/pT+mIcNJrIFtqP lxMr4+uCDhdUXWiSEPVQS0TZZW4hDkuhiqFMH9MCFUAZxlcfHHULdDWdkRps6n86UOFXi9t4NXAB7 SLFn91KS6FRCGO1d97udylBIYO40HhxiHtWeIzh+84epDlZk88kzGuU+f27mW4RbiYEsOYinxwY++ AtmVPZCQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1v1PDx-000000004xm-2oNB; Wed, 24 Sep 2025 13:07:57 +0000 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1v1PDu-000000004uK-3yet for linux-arm-kernel@lists.infradead.org; Wed, 24 Sep 2025 13:07:56 +0000 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-b33d785db6fso78198366b.2 for ; Wed, 24 Sep 2025 06:07:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1758719272; x=1759324072; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pL2uoqzypHbRpbvTBPNzb3YECUS6GHGmBJvJaUK0ytc=; b=NC1rtuDCFwsXKyafGcfgVtCqJu+GEP/ZQFHYBTrsYigBq6w4h3WWTKF2MSpVNlSRaK HnGJMRiT7hvvzlyZKjDbA6iMWwydvWiCrrBr6qoaWRISqo/I1SFsUu3oYfGJv+uJOqe9 wScXBfKeaEvT7wrVxMxQlkyOOh+z7aB6hYfmE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758719272; x=1759324072; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pL2uoqzypHbRpbvTBPNzb3YECUS6GHGmBJvJaUK0ytc=; b=PG4VJ1vm+Glq+W/UUr+yIwtYjvoErEYBswhM8Ek5R8FBAXmg25UioigF8h+4XrZC7d aYIObwn8WlXIOnyfkK7glAOGa3qcA8NILEhGGggOpW/Ehyx4aYc3Q2QGROFUq75BLmJv kys1rjW71SwgrRxcCHCiRcxRBRK99eadwdpz1kRZ7qNcMLQ0UFTMSZSUFMHgRG2zbAzg UeHDQsDWS4T5suAVWvMAjRAPWoM1ckplr3GrJsCugUinUEJwiwwk6GZOMqqO38w20FM5 6r8gZo8XCdYP0kV4KRXD+8Zv4KXs4Y5c3wX8EPlb1wb+REuJri3MDX+w5GyKxEX6ZDic Bf+w== X-Forwarded-Encrypted: i=1; AJvYcCWKBOLzqExB89paKUWobOS1KVXwkNBuxWAcnPfduTGqnIwvh6yJoKEc6ckUHYJLWBm+AHMAnUeXJ8iyHHlfCOIi@lists.infradead.org X-Gm-Message-State: AOJu0YwP++9DvtpRhHSr2noq2Zy+ogt9FThf2JtMTR32YljIujc60dZ1 a/KeQfUW3J9ptFiRlY6n1dmsHLA+dk2k/f8jI0395oiLmEMM2gfVrfqf0GWMCqkpb/Y= X-Gm-Gg: ASbGncvR//Lxb0RAPIZV8QEGxPfEs+z1sSBlabKW11b38TPPF7uZXoOQjjaNl5E3+FG NsaIInBh4nbfCMM8rW0qlDjJmMkCbnttI/rHYJQvcwVKk3Nm47c7pTY6PTZnHsjvBv31gluprm5 XTlDP7h3FT2dXoH/6x7dMg+WXBWbwaIJAIy7bN00d3450N4riROtogkEHPXLIGaeQSRqaoCYkXQ vwBY7P8yqceaO0vZM8hc+C+wDnl+YDmtixkTyWIyE0QUI+d11PHIqTuib7sddKuscVCyfz0je3b ws+SITGm7NcH0gbaBCPzekgKFtPipIO7FmryJFhwY5zftjlqvWPP7utbHtOihrzC7yWzOKRG6H2 Nnca28EqDsa+HzhyvAEtfON7lzdAzgD/LvhKz+RPVVA7GsjiElrQAiF6fKvsJDm8VX+RGTH+WmE 7oGy5LdL2LK4u4gdiSIRKOMrnSAv9Oo/BPQzVpejy2oOv3sFJKUmdGlQxVnso= X-Google-Smtp-Source: AGHT+IFYMpB/hfnnMwqXioIIY9YN2MfPYZ5TpMlDu73cNBgIUPkKRv7kC+0WMvzmPN4O0yWcKdtA3Q== X-Received: by 2002:a17:907:3f20:b0:b2e:34f1:9dbf with SMTP id a640c23a62f3a-b30261c1e6amr601703866b.1.1758719272475; Wed, 24 Sep 2025 06:07:52 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com (host-82-56-38-125.retail.telecomitalia.it. [82.56.38.125]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b1fc5f382b0sm1574379866b.2.2025.09.24.06.07.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Sep 2025 06:07:51 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, Frank Li , Sascha Hauer , Shawn Guo , Mark Brown , Dario Binacchi , Michael Trimarchi , Fabio Estevam , Jaroslav Kysela , Liam Girdwood , Pengutronix Kernel Team , Takashi Iwai , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-sound@vger.kernel.org Subject: [RESEND PATCH 1/3] ASoC: mxs-saif: support usage with simple-audio-card Date: Wed, 24 Sep 2025 15:07:44 +0200 Message-ID: <20250924130749.3012071-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250924_060755_168692_69C26868 X-CRM114-Status: GOOD ( 21.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add support for enabling MCLK output when using the simple-audio-card driver. In the sound/soc/mxs/mxs-sgtl5000.c use case, that driver handles MCLK enable/disable by calling mxs_saif_get_mclk() and mxs_saif_put_mclk() at probe/remove. This does not happen when the simple-audio-card driver is used. Extend the mxs-saif driver to enable MCLK output in that scenario. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi --- sound/soc/mxs/mxs-saif.c | 123 ++++++++++++++++++++++++++++----------- 1 file changed, 90 insertions(+), 33 deletions(-) diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 3e3a62df3d7e..a01a680ad4d7 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -24,8 +24,79 @@ #define MXS_SET_ADDR 0x4 #define MXS_CLR_ADDR 0x8 +#define MXS_SAIF_BUSY_TIMEOUT_US 10000 + static struct mxs_saif *mxs_saif[2]; +/* + * Since SAIF may work on EXTMASTER mode, IOW, it's working BITCLK&LRCLK + * is provided by other SAIF, we provide a interface here to get its master + * from its master_id. + * Note that the master could be itself. + */ +static inline struct mxs_saif *mxs_saif_get_master(struct mxs_saif *saif) +{ + return mxs_saif[saif->master_id]; +} + +static int __mxs_saif_put_mclk(struct mxs_saif *saif) +{ + u32 stat; + int ret; + + ret = readx_poll_timeout(__raw_readl, saif->base + SAIF_STAT, stat, + (stat & BM_SAIF_STAT_BUSY) == 0, + MXS_SAIF_BUSY_TIMEOUT_US, + USEC_PER_SEC); + if (ret) { + dev_err(saif->dev, "error: busy\n"); + return -EBUSY; + } + + /* disable MCLK output */ + __raw_writel(BM_SAIF_CTRL_CLKGATE, + saif->base + SAIF_CTRL + MXS_SET_ADDR); + __raw_writel(BM_SAIF_CTRL_RUN, + saif->base + SAIF_CTRL + MXS_CLR_ADDR); + + saif->mclk_in_use = 0; + + return 0; +} + +static int __mxs_saif_get_mclk(struct mxs_saif *saif) +{ + u32 stat; + struct mxs_saif *master_saif; + + if (!saif) + return -EINVAL; + + /* Clear Reset */ + __raw_writel(BM_SAIF_CTRL_SFTRST, + saif->base + SAIF_CTRL + MXS_CLR_ADDR); + + /* FIXME: need clear clk gate for register r/w */ + __raw_writel(BM_SAIF_CTRL_CLKGATE, + saif->base + SAIF_CTRL + MXS_CLR_ADDR); + + master_saif = mxs_saif_get_master(saif); + if (saif != master_saif) { + dev_err(saif->dev, "can not get mclk from a non-master saif\n"); + return -EINVAL; + } + + stat = __raw_readl(saif->base + SAIF_STAT); + if (stat & BM_SAIF_STAT_BUSY) { + dev_err(saif->dev, "error: busy\n"); + return -EBUSY; + } + + saif->mclk_in_use = 1; + + return 0; +} + /* * SAIF is a little different with other normal SOC DAIs on clock using. * @@ -48,6 +119,7 @@ static int mxs_saif_set_dai_sysclk(struct snd_soc_dai *cpu_dai, int clk_id, unsigned int freq, int dir) { struct mxs_saif *saif = snd_soc_dai_get_drvdata(cpu_dai); + int ret; switch (clk_id) { case MXS_SAIF_MCLK: @@ -56,18 +128,22 @@ static int mxs_saif_set_dai_sysclk(struct snd_soc_dai *cpu_dai, default: return -EINVAL; } - return 0; -} -/* - * Since SAIF may work on EXTMASTER mode, IOW, it's working BITCLK&LRCLK - * is provided by other SAIF, we provide a interface here to get its master - * from its master_id. - * Note that the master could be itself. - */ -static inline struct mxs_saif *mxs_saif_get_master(struct mxs_saif * saif) -{ - return mxs_saif[saif->master_id]; + if (!saif->mclk_in_use && freq) { + ret = __mxs_saif_get_mclk(saif); + if (ret) + return ret; + + /* enable MCLK output */ + __raw_writel(BM_SAIF_CTRL_RUN, + saif->base + SAIF_CTRL + MXS_SET_ADDR); + } else if (saif->mclk_in_use && freq == 0) { + ret = __mxs_saif_put_mclk(saif); + if (ret) + return ret; + } + + return 0; } /* @@ -238,34 +314,15 @@ int mxs_saif_get_mclk(unsigned int saif_id, unsigned int mclk, unsigned int rate) { struct mxs_saif *saif = mxs_saif[saif_id]; - u32 stat; int ret; - struct mxs_saif *master_saif; if (!saif) return -EINVAL; - /* Clear Reset */ - __raw_writel(BM_SAIF_CTRL_SFTRST, - saif->base + SAIF_CTRL + MXS_CLR_ADDR); - - /* FIXME: need clear clk gate for register r/w */ - __raw_writel(BM_SAIF_CTRL_CLKGATE, - saif->base + SAIF_CTRL + MXS_CLR_ADDR); - - master_saif = mxs_saif_get_master(saif); - if (saif != master_saif) { - dev_err(saif->dev, "can not get mclk from a non-master saif\n"); - return -EINVAL; - } - - stat = __raw_readl(saif->base + SAIF_STAT); - if (stat & BM_SAIF_STAT_BUSY) { - dev_err(saif->dev, "error: busy\n"); - return -EBUSY; - } + ret = __mxs_saif_get_mclk(saif); + if (ret) + return ret; - saif->mclk_in_use = 1; ret = mxs_saif_set_clk(saif, mclk, rate); if (ret) return ret; -- 2.43.0 base-commit: cec1e6e5d1ab33403b809f79cd20d6aff124ccfe branch: microgea-rmm-audio