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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8484C433EF for ; Thu, 16 Jun 2022 20:49:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378968AbiFPUtN (ORCPT ); Thu, 16 Jun 2022 16:49:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378874AbiFPUsj (ORCPT ); Thu, 16 Jun 2022 16:48:39 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1A015EBC2 for ; Thu, 16 Jun 2022 13:48:21 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id g16-20020a17090a7d1000b001ea9f820449so2818803pjl.5 for ; Thu, 16 Jun 2022 13:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=7AJn08pW02tF965v0Zsvg646CXfRm82BuAMcsSiDxYo=; b=i/kH0v1dne6Zn8uPbB1ueElswUjgT/yTFXTNnBQmQqVWocWZxvGDRFwBQPCgEjZcwt DHW+izRBKx0cz2xBlUq2RrN9DJ22qLSQ47bRF9P/mGJLryASSGePSxfmcFgmUCas2i23 asnkOlYviO3+ExgPo+5i6i0gV6JqUhM2S/znM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=7AJn08pW02tF965v0Zsvg646CXfRm82BuAMcsSiDxYo=; b=UvBc/VpXCL65K1tQ2c6aBYPeCJqF08HHCtOtNkooX1wYFGvmRwEz8DGVre8uZyh9w9 8c3ZkMJ+Wr2LvwR5B95iGnO8eEkSvDNFsVLGpjPrw4dUoanS9YQGEYKGiNc1H27wtPJL P7n71p0B/KG2x2pTSZRdui9JGRzH9xAGdoBBsJIwn2ITx50gPaxChVa/DgpTBpFih01W ZNpSRdpKwHZMlvhzNi/XsQZMSPLEpHiTFDpoi7ncaDdSPXnDbAXFcpQFk5XxJljpoULv EOzqkCnWyq6M5d4hFgc7GSRIdH1/uT5lJn9eaR/vfHGE/qWlHx3LFr0qoNxFAPOhLMd4 fKFg== X-Gm-Message-State: AJIora/LEee1n8X/aRnyswmixnOYPI5haEjsfDNJwgvbEU1MG/8ZcSMX VBqXQCH/IWvqSlbOCgwpi2SLyA== X-Google-Smtp-Source: AGRyM1sXlJmDftLj2gIeCg+QvZItPdfFXrzD22pR9q6/q1KwqJH22TcK4LdHMUYCPdy8v2eU0G7bwA== X-Received: by 2002:a17:90b:2310:b0:1e8:8379:6098 with SMTP id mt16-20020a17090b231000b001e883796098mr6832173pjb.112.1655412500987; Thu, 16 Jun 2022 13:48:20 -0700 (PDT) Received: from google.com ([2620:15c:202:201:4709:a407:1ca6:24ea]) by smtp.gmail.com with ESMTPSA id fs20-20020a17090af29400b001ea75a02805sm4221264pjb.52.2022.06.16.13.48.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jun 2022 13:48:20 -0700 (PDT) Date: Thu, 16 Jun 2022 13:48:18 -0700 From: Brian Norris To: Judy Hsiao Cc: Heiko Stuebner , Liam Girdwood , Rob Herring , Mark Brown , Jaroslav Kysela , Chen-Yu Tsai , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 1/3] ASoC: rockchip: i2s: switch BCLK to GPIO Message-ID: References: <20220616155836.3401420-1-judyhsiao@chromium.org> <20220616155836.3401420-2-judyhsiao@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220616155836.3401420-2-judyhsiao@chromium.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Thu, Jun 16, 2022 at 03:58:34PM +0000, Judy Hsiao wrote: > We discoverd that the state of BCLK on, LRCLK off and SD_MODE on > may cause the speaker melting issue. Removing LRCLK while BCLK > is present can cause unexpected output behavior including a large > DC output voltage as described in the Max98357a datasheet. > > In order to: > 1. prevent BCLK from turning on by other component. > 2. keep BCLK and LRCLK being present at the same time > > This patch switches BCLK to GPIO func before LRCLK output, and > configures BCLK func back during LRCLK is output. > > Without this fix, BCLK is turned on 11 ms earlier than LRCK by the > da7219. > With this fix, BCLK is turned on only 0.4 ms earlier than LRCK by > the rockchip codec. > > Signed-off-by: Judy Hsiao It feels like a lot of the noise in this patch is due to adding additional error handling, unrelated to the real change you're making. Maybe that deserves a separate patch? > --- > sound/soc/rockchip/rockchip_i2s.c | 134 ++++++++++++++++++++++++------ > 1 file changed, 108 insertions(+), 26 deletions(-) > > diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c > index 47a3971a9ce1..574d3d0900c4 100644 > --- a/sound/soc/rockchip/rockchip_i2s.c > +++ b/sound/soc/rockchip/rockchip_i2s.c > @@ -54,8 +54,40 @@ struct rk_i2s_dev { > const struct rk_i2s_pins *pins; > unsigned int bclk_ratio; > spinlock_t lock; /* tx/rx lock */ > + struct pinctrl *pinctrl; > + struct pinctrl_state *bclk_on; > + struct pinctrl_state *bclk_off; > }; > > +static int i2s_pinctrl_select_bclk_on(struct rk_i2s_dev *i2s) > +{ > + int ret = 0; > + > + if (!IS_ERR(i2s->pinctrl) && !IS_ERR_OR_NULL(i2s->bclk_on)) > + ret = pinctrl_select_state(i2s->pinctrl, > + i2s->bclk_on); > + > + if (ret) > + dev_err(i2s->dev, "bclk enable failed %d\n", ret); > + > + return ret; > +} > + > +static int i2s_pinctrl_select_bclk_off(struct rk_i2s_dev *i2s) > +{ > + > + int ret = 0; > + > + if (!IS_ERR(i2s->pinctrl) && !IS_ERR_OR_NULL(i2s->bclk_off)) > + ret = pinctrl_select_state(i2s->pinctrl, > + i2s->bclk_off); > + > + if (ret) > + dev_err(i2s->dev, "bclk disable failed %d\n", ret); > + > + return ret; > +} > + > static int i2s_runtime_suspend(struct device *dev) > { > struct rk_i2s_dev *i2s = dev_get_drvdata(dev); > @@ -92,39 +124,46 @@ static inline struct rk_i2s_dev *to_info(struct snd_soc_dai *dai) > return snd_soc_dai_get_drvdata(dai); > } > > -static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) > +static int rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) > { > unsigned int val = 0; > int retry = 10; > - > + int ret = 0; > + > spin_lock(&i2s->lock); > if (on) { > - regmap_update_bits(i2s->regmap, I2S_DMACR, > + ret = regmap_update_bits(i2s->regmap, I2S_DMACR, > I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_ENABLE); I mentioned this off-list, but the 2nd-line indentation alignment *used* to be in a very particular style, and you've moved that around a lot. To match the previous style, it should be: ret = regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_ENABLE); (BTW, if you're using Gmail to view this, you're going to have no idea what I'm talking about, since it doesn't do whitespace or monospace font correctly...) The same applies throughout; most of the 2nd-line, 3rd-line, ... indentation is a little weird. > - > - regmap_update_bits(i2s->regmap, I2S_XFER, > + if (ret < 0) > + goto end; > + ret = regmap_update_bits(i2s->regmap, I2S_XFER, > I2S_XFER_TXS_START | I2S_XFER_RXS_START, > I2S_XFER_TXS_START | I2S_XFER_RXS_START); > - > + if (ret < 0) > + goto end; > i2s->tx_start = true; > } else { > i2s->tx_start = false; > > - regmap_update_bits(i2s->regmap, I2S_DMACR, > + ret = regmap_update_bits(i2s->regmap, I2S_DMACR, > I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE); > + if (ret < 0) > + goto end; > > if (!i2s->rx_start) { > - regmap_update_bits(i2s->regmap, I2S_XFER, > + ret = regmap_update_bits(i2s->regmap, I2S_XFER, > I2S_XFER_TXS_START | > I2S_XFER_RXS_START, > I2S_XFER_TXS_STOP | > I2S_XFER_RXS_STOP); > - > + if (ret < 0) > + goto end; > udelay(150); > - regmap_update_bits(i2s->regmap, I2S_CLR, > + ret = regmap_update_bits(i2s->regmap, I2S_CLR, > I2S_CLR_TXC | I2S_CLR_RXC, > I2S_CLR_TXC | I2S_CLR_RXC); > - > + if (ret < 0) > + goto end; > regmap_read(i2s->regmap, I2S_CLR, &val); > > /* Should wait for clear operation to finish */ > @@ -138,42 +177,55 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) > } > } > } > +end: > spin_unlock(&i2s->lock); > + if (ret < 0) > + dev_err(i2s->dev, "lrclk update failed\n"); > + > + return ret; > } > > static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) > { > unsigned int val = 0; > int retry = 10; > + int ret = 0; > > spin_lock(&i2s->lock); > if (on) { > - regmap_update_bits(i2s->regmap, I2S_DMACR, > + ret = regmap_update_bits(i2s->regmap, I2S_DMACR, > I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_ENABLE); > + if (ret < 0) > + goto end; > > - regmap_update_bits(i2s->regmap, I2S_XFER, > + ret = regmap_update_bits(i2s->regmap, I2S_XFER, > I2S_XFER_TXS_START | I2S_XFER_RXS_START, > I2S_XFER_TXS_START | I2S_XFER_RXS_START); > - > + if (ret < 0) > + goto end; > i2s->rx_start = true; > } else { > i2s->rx_start = false; > > - regmap_update_bits(i2s->regmap, I2S_DMACR, > + ret = regmap_update_bits(i2s->regmap, I2S_DMACR, > I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_DISABLE); > + if (ret < 0) > + goto end; > > if (!i2s->tx_start) { > - regmap_update_bits(i2s->regmap, I2S_XFER, > + ret = regmap_update_bits(i2s->regmap, I2S_XFER, > I2S_XFER_TXS_START | > - I2S_XFER_RXS_START, > + I2S_XFER_RXS_START, > I2S_XFER_TXS_STOP | > I2S_XFER_RXS_STOP); > - > + if (ret < 0) > + goto end; > udelay(150); > - regmap_update_bits(i2s->regmap, I2S_CLR, > + ret = regmap_update_bits(i2s->regmap, I2S_CLR, > I2S_CLR_TXC | I2S_CLR_RXC, > I2S_CLR_TXC | I2S_CLR_RXC); > - > + if (ret < 0) > + goto end; > regmap_read(i2s->regmap, I2S_CLR, &val); > > /* Should wait for clear operation to finish */ > @@ -187,7 +239,12 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) > } > } > } > +end: > spin_unlock(&i2s->lock); > + if (ret < 0) > + dev_err(i2s->dev, "lrclk update failed\n"); > + > + return ret; > } > > static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai, > @@ -425,17 +482,25 @@ static int rockchip_i2s_trigger(struct snd_pcm_substream *substream, > case SNDRV_PCM_TRIGGER_RESUME: > case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: > if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) > - rockchip_snd_rxctrl(i2s, 1); > + ret = rockchip_snd_rxctrl(i2s, 1); > else > - rockchip_snd_txctrl(i2s, 1); > + ret = rockchip_snd_txctrl(i2s, 1); > + if (ret < 0) > + return ret; > + i2s_pinctrl_select_bclk_on(i2s); > break; > case SNDRV_PCM_TRIGGER_SUSPEND: > case SNDRV_PCM_TRIGGER_STOP: > case SNDRV_PCM_TRIGGER_PAUSE_PUSH: > - if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) > - rockchip_snd_rxctrl(i2s, 0); > - else > - rockchip_snd_txctrl(i2s, 0); > + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { > + if (!i2s->tx_start) > + i2s_pinctrl_select_bclk_off(i2s); > + ret = rockchip_snd_rxctrl(i2s, 0); > + } else { > + if (!i2s->rx_start) > + i2s_pinctrl_select_bclk_off(i2s); > + ret = rockchip_snd_txctrl(i2s, 0); > + } > break; > default: > ret = -EINVAL; > @@ -736,6 +801,23 @@ static int rockchip_i2s_probe(struct platform_device *pdev) > } > > i2s->bclk_ratio = 64; > + i2s->pinctrl = devm_pinctrl_get(&pdev->dev); > + if (IS_ERR(i2s->pinctrl)) > + dev_err(&pdev->dev, "failed to find i2s pinctrl\n"); > + > + i2s->bclk_on = pinctrl_lookup_state(i2s->pinctrl, > + "bclk_on"); > + if (!IS_ERR_OR_NULL(i2s->bclk_on)) { > + dev_info(&pdev->dev, "switch bclk to GPIO func\n"); I don't think we need this printed at the KERN_INFO level. Either drop it, or maybe dev_dbg(). Brian > + i2s->bclk_off = pinctrl_lookup_state(i2s->pinctrl, > + "bclk_off"); > + if (IS_ERR_OR_NULL(i2s->bclk_off)) { > + dev_err(&pdev->dev, "failed to find i2s bclk_off\n"); > + goto err_clk; > + } > + } > + > + i2s_pinctrl_select_bclk_off(i2s); > > dev_set_drvdata(&pdev->dev, i2s); > > -- > 2.36.1.476.g0c4daa206d-goog >