From patchwork Wed Sep 24 10:16:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4358 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id BF61A3F096 for ; Wed, 24 Sep 2025 12:16:46 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-6344e493258sf3347357a12.2 for ; Wed, 24 Sep 2025 03:16:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1758709006; cv=pass; d=google.com; s=arc-20240605; b=faXOY21Mn5Qe/LT8IY2fw5wVLI8VUQkc6nKap3KlRd6ZEfiZpp52KPrlrwhiNRo5Dv /igLLalEiof1qNjEL+cBuc87W3MjdG/MNFtw1rVoEN9PouvO86iM/nizbH5DaLGlCcVp KR3/Rt3PPBHXNVk4St3PUZqWwnhHTtVlHMVyKqy1QNzm7Mvu/DLZXwK0jo4fLKxemPvj JMiylYPJyN6eKTflV7YlD9/bSOpweA3v2eQBukzakf66wRf6NSnDSR8xt+Eoz1gdZYke K0d48PTZSdaRp8ThzJnmY65ZzKz2DNezdvIHz1fZjR6uA8OYefoNj/M2l8bqqe8kfgVV Gm+A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=Rs+X4VJG7NXfLzIC+ub8F4R8PQLQO1FSCElm/VOhLOU=; fh=Ov0t3I55JK9DS0TL/Mn9MS3dahfI22/pZcc0MK7ynoQ=; b=M9qLti6/EZzauK/fstyNfdC7JEEiHS12m1KygtLqu1suVwowgFy9D/5h/cLikae40V Eqb+nxcBn7YCTiYLkuE8h63pokJoRs6HJ8psda51UoLecjiHDPNLgVwRiabBDsmp3AU+ XcTxuC8Sp3iOyKKngq6zlxLEII/BFQFkuvcaMv0LwqO+WR48Db9eAehDTgZvBFWibNX3 wf6axQB1yAVMu4d+RLkhEhkpL2kbLWy5ely/2OWjcQVvuWlDbPuSBqRnVvK3Rkgxv/c5 19sSsnpUgI8d119LIV7p71qaSADcxGwZSXs5RYkol8UMuBsEcEDp7kcPvxpU71wCa9Z3 7HzQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="bxj/nxAc"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1758709006; x=1759313806; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=Rs+X4VJG7NXfLzIC+ub8F4R8PQLQO1FSCElm/VOhLOU=; b=QnRTN+WmabgNnW44ThZE1VRUgJGaZPwcLJGmQodT5SWLM51ggH69trcfXS6FjcskAD HsdqJlenuy0oEU3MURx/7Sfp7Lqf0j603pwqlHdSiOQ9RRl4g/OCNOtm1GXbPo6Mifog YmxFvWDSYC5iPQqjRm88syiW4Ck02R4I0rVzU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758709006; x=1759313806; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Rs+X4VJG7NXfLzIC+ub8F4R8PQLQO1FSCElm/VOhLOU=; b=n9dSiyonCjoVcjvaytAfoXUSfSTWFQ2mhxNZHOTs2OQzPVD10m9pWwYU6u6I23P4Fi Gz7p/hjykfmgEVn4M61cuWf0juSvZanJy+WlpQPeJnsNCrCV0l6fwQqi+RAMi6B6RbUP 3THT8aDS/KDxGJzaOkMT79xdX+YrQSjl7pQucZaWkt62VXizPx+IDNLg9QjgILDmTOub qu+pXKwQuQ55V75Q6VDoCr463klWm/JJJugYBNoaQflOZnXA8TbhkbYGLKYK7z5yi7Dk VCAmrU4TonEV3qdJBFZkrUbAcdykVkG0pzqRySnM7Ku278H1kQ7vLCgjzal7IXht9rIM KiSQ== X-Forwarded-Encrypted: i=2; AJvYcCX5sGvrkfopqs7JPcCtBpkeaGknxgEHChlGF+c0ihNgyGrtNly8o8kAokzBm5unNz91I0PTQvC8HcNIRAXO@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YyuJqcAA1AIvt8r/yNzTOVskxv4GGlggCVdu38p92qh4NOF6SkP w7t7U5TbPMH2zShbJH9bu2ca+3G+da+vg+CniIoNmkhXxAW+Hg3zWbq48IcieNCTeHtdbQ== X-Google-Smtp-Source: AGHT+IG2z/pd6BFX/clYWaxFFXvmCFisTBKpzMrpTj5MIBQ/dXjLpGpBpoUQWw2iKom39hRQ+/dgKA== X-Received: by 2002:a05:6402:52d5:b0:631:c0a4:69f9 with SMTP id 4fb4d7f45d1cf-6346780bf8cmr4469541a12.17.1758709006213; Wed, 24 Sep 2025 03:16:46 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=ARHlJd5mPDosQxZIMPdTLY72U969Z7yikldI1toTCDSZYyx3Bw== Received: by 2002:a05:6402:b42:b0:62e:c6c1:daaf with SMTP id 4fb4d7f45d1cf-62fa76fdbc1ls5625402a12.1.-pod-prod-05-eu; Wed, 24 Sep 2025 03:16:43 -0700 (PDT) X-Received: by 2002:a17:907:9628:b0:b0e:cb5a:3dc9 with SMTP id a640c23a62f3a-b30263b8316mr514933166b.8.1758709003588; Wed, 24 Sep 2025 03:16:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1758709003; cv=none; d=google.com; s=arc-20240605; b=epPXOL7KRYWddT0B5ViJyaYfMgEjWzAI6Vr8qC8HyDRsYNba0wA0OUuzt0XdzHDVeq 6iuqjwzRm0hXL33qZoIDwns227ot4IKe8JEVFETDfRqkAw44jgE2O/fesT5kETgWrmIq UOWD9gFp94Zvu4db0P7ez79elKRSFHshMadOrS+iP1XZ2DMJHs11/c5wW8dMvl5hQRRH QIpIQilgmDt4ERgl+OAyRR/uVW61z1UuzsW9l2tl/TgH0iVj5f/masKE+Ut/YewBWaHp GigiRUUL2gjZZe5WqQtIwFzFxtBQQlUshqPTICfE8P9CYpdwOgoYSmAQhSJCyoPl9VlE CF/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=pL2uoqzypHbRpbvTBPNzb3YECUS6GHGmBJvJaUK0ytc=; fh=UkaK5CY0Yqh3QadA9HIsdv5KEDQigwxI+SFN91AXkQU=; b=T5NQtMSDItU+Lgtztt5VCOzGcYOTtEu6H1nmLt3zOuKZvLUEC6ztTUaa3l1U7cn5c/ WSzsmCATSP22zeUsnLC9OqrsJsb1GvpOvnTU2MfoXP4rBC5aZEwigQw/LozXzzb7wzqO f/Y/BTTg9HJEB51PPiX36k93jO8ZWsMlRjbk0P7hmf49Ub0PMQIIcq00OWVJyoRXD6di 3+2Naw/iBkDpZOdo5wlXXnNVlLCsWT5MrkVB10EyEKUlzsSlce4Uw0kAV/GFg58pYhph Dx8ayhyT9ugsahNTEsRpDap9uCfMOqfj4tID7KOffle36tdMLVuCj5NpxBXqgnx15GI3 OItA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="bxj/nxAc"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-b1fc890c9ecsor675063966b.8.2025.09.24.03.16.43 for (Google Transport Security); Wed, 24 Sep 2025 03:16:43 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Gm-Gg: ASbGncswQyVWH/16K1YgMibmPxSbKg2/tWVOLDLNMANskxUJ/K3ANMEua6e8RyHZYP4 ConRDhXypwGc8BN18gnFXLK/Xo2vXdEnBEiXAdZFaDBAu8xDikaHASkjrjb03/9u7POWvDgWmZs GGGYK3pFb1AS9llFHmK36mqT1t7WyLpmzIC0wt0/Ew0U2B8xrE8baLf33+jDek70dBjzh9Q38Bh SQddhS4opOM/2F3/eU9a1JyKub+RAEOy3xR1j03Iz5OexGo4VahSw2OTJ1mx2HO4lnlzy8N5xrw ZDQI4pYXfg5f4NGQZXiVagoChU8MCpKhuhrc3k8uBqfZ1OIaQRaMaiAFFzwvbeKDcCjgZKNGRTJ SRqBJliIqEefDfIdG+NJ0rbFv6OElQ/aUugzpYPmK6p26F6vYVGw7M94y+DCvRCORUOkqS2iJcu XMkkdsx2FpFVrgNAfAN9D2qHPp3HTUW+e7dIY7wkjU4NutX8EKjpeC7duRAqea8/+IT0prMw== X-Received: by 2002:a17:907:1c10:b0:b2d:d73:de59 with SMTP id a640c23a62f3a-b30263b7c73mr570377266b.9.1758709003021; Wed, 24 Sep 2025 03:16:43 -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-b28d206bd13sm949712766b.31.2025.09.24.03.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Sep 2025 03:16:42 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Michael Trimarchi , Fabio Estevam , Jaroslav Kysela , Liam Girdwood , Mark Brown , Pengutronix Kernel Team , Sascha Hauer , Shawn Guo , Takashi Iwai , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-sound@vger.kernel.org Subject: [PATCH 1/3] ASoC: mxs-saif: support usage with simple-audio-card Date: Wed, 24 Sep 2025 12:16:25 +0200 Message-ID: <20250924101640.2942635-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="bxj/nxAc"; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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;