From patchwork Wed Sep 24 13:07:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4361 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 58F583F096 for ; Wed, 24 Sep 2025 15:07:56 +0200 (CEST) Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-b33d785dc3bsf37797466b.3 for ; Wed, 24 Sep 2025 06:07:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1758719276; cv=pass; d=google.com; s=arc-20240605; b=Jl1qqSeZCQ++G1Wxr2NsvlSzsuT0vtaH68c0Dkx9X8egs7RVhb5v0IayKw1zvTiTcz sSYp+bPIXyEG8lSrhgzKVdIob1JczCHx3GrKqf/hgyv+FECgToX8L/ep/2TBzEdXmj0b B2tfo6lRg9KQ4cHGH8ug5Z52FnC/5zCGG4pQUugNTbK8vVew0Lpid/M3o0KOT5nTku4O 8d+2nbhQq9geWoJfZBCPsgcQNWtAnZFXrchYHJuQuNdTqZxStz4+VcEQlkrtOgSCGiKf GZK1B9NZxq8FL+WV/16QaXaHUT9h7S5SxAAIUmWVmKi68405AGElmAdNvclwS34hb5pg 1U8Q== 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=2mdnHM6JW0Nij0kY4wxfgLt89Q4EiYMoJFhg34TTXmQ=; b=JMqSbDmzAZ642P6KCHsHH7dvSlRjVJtef5JHZ4rre1dJDd1imHmwKlSxlVcIU1KVFw hUGqBEx2BDRUNCYNDubynR5j/mtkPB5Q0FvkUkSkHcnoEpqgbfpawFj5bIoQJwaNJQR6 vtPW2Re5kKR3HFsCrA6kdRNpyZKGc6643ZMVixy5o7UpXa6zeb2KJX4+sMrEBGBVhb/r VMLrl8zpXVzNl+BQABCdyzH7WtWndYzlWdMj8iy4ExsVN8mR3DEXme7687x+zmmQL8bC dF/NItknc5LRBYOpPZj3lj2oEhF1JnWjlMuiFFi/I9FD3Kf9bYgI4hyBJUh7CHg8ctIe i8Sg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=NrFj15En; 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=1758719276; x=1759324076; 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=po5Hz4BTh9SVR+dA7DGN6D9Rc3dQP9ndJf/w47B5ugPZFufgGbrjdIu6x1kCbTkXOl 4Q47w4OLW4FzFrAMQCKHD3X93DoYzz4OOz31x/m5fyf/JNmlgP+r3fU5e67Xj34hhBMV CTNp6azEAvwf6FLiefZ8YlqyEzQKT7HzRuLIU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758719276; x=1759324076; 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=WMx2vMBN9vSF2LtX1XvXAznmZrakGwHuKNJvNWOyOso+HcUMRd2dwBRz3pKmvNiQ9x d90llP/R3qJuHEPRtpGZjwwc5Djm2TeAcW1esiuGE/Y000KT9YXVrL4koY7CikbkAUlV HoLhPwpPVzL0CU1jJds5V4zd3QTmLfal1zhkGdXh0h963YvJEEIjRzboURzWonTY8OXn MSndGUEE6rq4OJ7brb2+25bHxbesh/N3jea89/n/1eBRftEfDRi6jbjAld+fSacYfSXD 4S2omTuKSudwMd0TY4OppXiVCnZEJDEUPySj9PH6O2CQGOqfmjjlSwUD4RwbrBe/4Lx2 HDSA== X-Forwarded-Encrypted: i=2; AJvYcCUC1R4zGo1ImgINF5MMqYOekcLC6uvIuniWuSV+rqyTTADzj3CL9lzmGgYQjWo5JgoTuttOdAcOK30EWE5+@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YwSNua/5Hg4UCml6hILF+9NgQ9n3Nb+lrYXLz3jUbuVMGRUltFo /LazWBlZefeYKCmvNUG0xMUVeBVEa+USRQSuSxmJWr64BUr7I9nDM/JA9huJLvEde2uc+Hh178p +iQ== X-Google-Smtp-Source: AGHT+IGHpktN7pCvCK8gNZ8IO3+3aEMkx8lW3OGaS06Ty91DTtYEMvEGvp4df5YmaPiFp/+UQ/+wnw== X-Received: by 2002:a17:907:980c:b0:b04:760d:1162 with SMTP id a640c23a62f3a-b302ac40ba3mr580130266b.47.1758719275507; Wed, 24 Sep 2025 06:07:55 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=ARHlJd7gQDrLe5DqYTQmE4Ei+xg7Rlnk+O7t9KQGcExQ4upe5g== Received: by 2002:a05:6402:311c:b0:627:95b9:e197 with SMTP id 4fb4d7f45d1cf-62fa7550920ls5498613a12.0.-pod-prod-08-eu; Wed, 24 Sep 2025 06:07:53 -0700 (PDT) X-Received: by 2002:a17:907:928a:b0:b0c:b51b:81f6 with SMTP id a640c23a62f3a-b302ac2b8c0mr631256366b.43.1758719273036; Wed, 24 Sep 2025 06:07:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1758719273; cv=none; d=google.com; s=arc-20240605; b=DYuPSFfkfhfKlDr3mo90/8ujy/gCZQG0eeIclRwAXnVjlsOX/krUDaPFOwfI6dtO4/ oARdX3FdRX/oCH/TcYKyE+b48iID0IHd9mM/7m7b8+FJsAHW1M1K/s6HWYLmYf2Zb6JD mGKjo7FV4l6TYu5tV/rVtA64ATOkjX7Cr4giwLeBlgPLq92WRcIskyk3nOARmKswUTM8 gF0ws7bFrT3tSD0Er4qo2pytu/QV977SHOcEPeKlrTlzj1Sr0Wpe9vOBBYkk7Yz9G5to +s3IGrWqO3Ih1TZT84FiMOQssUJ55cT4dII/97OJnKVMQQQR5593m57/iGgPc2HuOXwP TFhQ== 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=JSwierpn6eDKJl3fLPLuJaqP24C5ZQ6VfAjKgpXv3sk=; b=JtsczIpBl9cgLhZN3oYBJEj7EnCshE4PV5shfTge3FZPxBzvIJTxdlvEjADEQ11qpQ jmsTx2ONfhyWtzde0ZThZlBOLrI5GAu+bnIcF/U/FD/sbkEgkOOdC8hb4sap+PTMHBaz X7lkdlqfud/7V/w0jSLh0cr6YwplWtWqLrHA3JLgc8KNaPIB51xpmyNsXxfjnnzXBdCD oxBA05Y80Paxps0l6at4Pi3MLWlTYgp0arENSqjv+0YVliNiSqJ8iBIUUS8TJLH1rzaj 55JVH4P3lBBTyFgRIFaEbeKG3uPlWwNsKB/8tdWY0MxxDYgzYDfoE9xrgClNtUObxq8/ EcvQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=NrFj15En; 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-b2eb791e82bsor287674766b.13.2025.09.24.06.07.52 for (Google Transport Security); Wed, 24 Sep 2025 06:07:53 -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: ASbGncsNCJRQLg1ie+0Yps8MrOqUULlecTX467IaKl0i7fhPGKuTQ+1ywpfxMwr6a6z 2DXpmoYK0Q/uQR3KhYl74LOg/g/ovJypEyWT8zpCsKINsRua9CpCXBUUcvddaCNO0R7TA1QaByD e9gK+ew12ad4TZQXqWtgqZsiR376Ht6hRttARyjOs67X4QjbEE5oGhjISz1vAv8oZe5QM+GYyRJ tkBXUTGGxAfv/gYDZuXchIUPwsYz0ErpFzxCfIFUQdn+izRkQ4nJOe4WwBMfqtSszeBHhpiinyS c/bbHZwqoCK3W7THnioGSgB39sEj9+2ePmWtcyySmKvj3Boxxsf9JlHr81KoEXKyrNJLP6qDygq KWQHsCOC010iZwBuqSJSNYj6RD5REi/hLt2hlFIPVJO8dEU0s1lYOERJMwtVlBraW945qc4627Z 4c0oBzwms+TevDDACv09RSVBCENYFySuxkrx75+6ktRXQ7U/P0LZH/o4LWlS0= 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 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=NrFj15En; 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;