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 X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB40CC2BA19 for ; Sat, 18 Apr 2020 22:49:30 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E1D521974 for ; Sat, 18 Apr 2020 22:49:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="nYjmCLO1"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NIOfImqp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E1D521974 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id ACF631677; Sun, 19 Apr 2020 00:48:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz ACF631677 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1587250168; bh=FZXamsjQGS3MIkmHjFzHJAaLqrnlzkPdkG6ITjaeL7M=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=nYjmCLO1bu5llL+sHon4QQSHp+wlQeO2TNrBjkMQPdwcRwpAo3OxW6LPgy53eMnkG jo7zwWpGzlF9gQEvse7h0HmL7mgals/tYW+YqLytZmLLmTg5qYk24igeKdf0B7Ketq lmF8exzUDXRPd3zzwOTiZeFSU7/38AkH/kuPM7R8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 368A9F802E0; Sun, 19 Apr 2020 00:45:00 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C9CFCF80292; Sun, 19 Apr 2020 00:44:53 +0200 (CEST) Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id EE478F8012E for ; Sun, 19 Apr 2020 00:44:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EE478F8012E Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NIOfImqp" Received: by mail-wr1-x441.google.com with SMTP id g13so5375551wrb.8 for ; Sat, 18 Apr 2020 15:44:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DdH07t1k9/y181hGinDV6UTR/Vqce1FXEwc4JDSNUgo=; b=NIOfImqp3qpMP3D9X6b+JfPw8bgsFJJLKGc6iM/svj0msjDwQB4NHHi3x6j4+/9LfH w1b1LK8t9l4uX6A46YGmQt9P7ru+6QI+xL5hGLIjDyhD96hkoA66gyw/Pv/5p18m5+Y4 xRY0pBCRDt+5PJPsr7ebb/yiZLIhYulHfqXCtzMBkh3q/WYyNJa04dmF8j/pJW6NXyJN vevvk/QIj/SNZsEVXrY4FSFbnO9mofuC1CQR7oEzIEaF0jiBTZyZoTXhwAvlz3/ErcIh asUcS5rQUe+zij5OFyhR3VRoF3JCU71k/uGoT6ZnsFLFFlpK3aedMIrs0DB8za7JPK7y bQBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DdH07t1k9/y181hGinDV6UTR/Vqce1FXEwc4JDSNUgo=; b=VzXQc2h6YDKiQYmNBFlyTvW3E8tpkcson0cZUrb8vYgb/hMJzBoKNhOCy3qcA7AzF3 BScptQWcFdQJzmVtY5+jYiJkptfK+g+p/GHI8chpCyfpvH+IlXMg9rdipHMWfNsrquMi oTrvGDtfHZjiypTOg6GPSf2lpOklYg/oPJp51uvGKPrLAjaaoWYc8IY8XPzn5QlXPcDi 5L+I2LX3AphxvVua24zn6OCQ89EkyStxaWUOHPsYyx96wrMOTAN5je0X5Y2BYHaKophx X52BvES2YJezsaZ1y176lulnBbGkstBD8buWHLgHZB2GqY2oqS7jN09LWWYgm/Uqc0rZ +R9Q== X-Gm-Message-State: AGi0PuaMiag64W9FKSSVSXBmAltNr1DUjRUrbzeZuyf9LrpbeTGoIJXs mJGkkVAd/9bIYTopNQ9aFNo= X-Google-Smtp-Source: APiQypKLBSnMaQwSZzz/e93DLQSKm39F96CERmHmKiJfEdeWuhNhNE+Fk3LRWI+U1wVer5IdoPcLQg== X-Received: by 2002:adf:f084:: with SMTP id n4mr11151919wro.252.1587249887329; Sat, 18 Apr 2020 15:44:47 -0700 (PDT) Received: from localhost.localdomain (91-167-199-67.subs.proxad.net. [91.167.199.67]) by smtp.gmail.com with ESMTPSA id t16sm13371559wmi.27.2020.04.18.15.44.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:44:46 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Liam Girdwood , Mark Brown , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v2 6/7] ASoC: sun4i-i2s: Adjust regmap settings Date: Sun, 19 Apr 2020 00:44:34 +0200 Message-Id: <20200418224435.23672-7-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418224435.23672-1-peron.clem@gmail.com> References: <20200418224435.23672-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Marcus Cooper , =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-arm-kernel@lists.infradead.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Marcus Cooper Bypass the regmap cache when flushing the i2s FIFOs and modify the tables to reflect this. Signed-off-by: Marcus Cooper Signed-off-by: Clément Péron --- sound/soc/sunxi/sun4i-i2s.c | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 9778af37fbca..9053d290dd87 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -921,7 +921,7 @@ static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) static void sun4i_i2s_start_capture(struct sun4i_i2s *i2s) { /* Flush RX FIFO */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_FIFO_CTRL_REG, + regmap_write_bits(i2s->regmap, SUN4I_I2S_FIFO_CTRL_REG, SUN4I_I2S_FIFO_CTRL_FLUSH_RX, SUN4I_I2S_FIFO_CTRL_FLUSH_RX); @@ -942,7 +942,7 @@ static void sun4i_i2s_start_capture(struct sun4i_i2s *i2s) static void sun4i_i2s_start_playback(struct sun4i_i2s *i2s) { /* Flush TX FIFO */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_FIFO_CTRL_REG, + regmap_write_bits(i2s->regmap, SUN4I_I2S_FIFO_CTRL_REG, SUN4I_I2S_FIFO_CTRL_FLUSH_TX, SUN4I_I2S_FIFO_CTRL_FLUSH_TX); @@ -1096,13 +1096,7 @@ static const struct snd_soc_component_driver sun4i_i2s_component = { static bool sun4i_i2s_rd_reg(struct device *dev, unsigned int reg) { - switch (reg) { - case SUN4I_I2S_FIFO_TX_REG: - return false; - - default: - return true; - } + return true; } static bool sun4i_i2s_wr_reg(struct device *dev, unsigned int reg) @@ -1121,6 +1115,8 @@ static bool sun4i_i2s_volatile_reg(struct device *dev, unsigned int reg) { switch (reg) { case SUN4I_I2S_FIFO_RX_REG: + case SUN4I_I2S_FIFO_TX_REG: + case SUN4I_I2S_FIFO_STA_REG: case SUN4I_I2S_INT_STA_REG: case SUN4I_I2S_RX_CNT_REG: case SUN4I_I2S_TX_CNT_REG: @@ -1131,23 +1127,12 @@ static bool sun4i_i2s_volatile_reg(struct device *dev, unsigned int reg) } } -static bool sun8i_i2s_rd_reg(struct device *dev, unsigned int reg) -{ - switch (reg) { - case SUN8I_I2S_FIFO_TX_REG: - return false; - - default: - return true; - } -} - static bool sun8i_i2s_volatile_reg(struct device *dev, unsigned int reg) { if (reg == SUN8I_I2S_INT_STA_REG) return true; if (reg == SUN8I_I2S_FIFO_TX_REG) - return false; + return true; return sun4i_i2s_volatile_reg(dev, reg); } @@ -1218,7 +1203,7 @@ static const struct regmap_config sun8i_i2s_regmap_config = { .reg_defaults = sun8i_i2s_reg_defaults, .num_reg_defaults = ARRAY_SIZE(sun8i_i2s_reg_defaults), .writeable_reg = sun4i_i2s_wr_reg, - .readable_reg = sun8i_i2s_rd_reg, + .readable_reg = sun4i_i2s_rd_reg, .volatile_reg = sun8i_i2s_volatile_reg, }; @@ -1231,7 +1216,7 @@ static const struct regmap_config sun50i_i2s_regmap_config = { .reg_defaults = sun50i_i2s_reg_defaults, .num_reg_defaults = ARRAY_SIZE(sun50i_i2s_reg_defaults), .writeable_reg = sun4i_i2s_wr_reg, - .readable_reg = sun8i_i2s_rd_reg, + .readable_reg = sun4i_i2s_rd_reg, .volatile_reg = sun8i_i2s_volatile_reg, }; -- 2.20.1 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 X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62942C352BE for ; Sat, 18 Apr 2020 22:46:34 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 308E121974 for ; Sat, 18 Apr 2020 22:46:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="hzoaKhQO"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NIOfImqp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 308E121974 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=snZ3kdIqv9XlCW90sXBTaDWUCknMDFhRrR+ft9NifRg=; b=hzoaKhQOxMC7D0 vEGTr8DDPx+LvrBWg69ncW0oQRcVzPfvKYXNdpOAs3q0MOx9VikDN+HITq7xn7ezv9mzCK0qEWMOB FJAA1xTN50v5W4b3wuLvJ9K+W5qPTuBFstCS1MIIu9qO0sFDZa0I22l4Ati9xldA5KZBzaumHwCg9 3O0HTUBehF+2K7Zl/OvVz2PY8ArmMvDL5svq37BANoBHct39P0zLa7sBa9vsUC5OO+zQOjMdTJ4AX NE1w0pXtVLj8r+8Ey7WIRDFy3TK8Gwd4+T+B7ORoNvK7SpjEVWEw5gLlId5Im4ECM4+IPa6R56UFW f2oj3T8xe1pd+Xpsqhwg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jPwEI-0002xS-0V; Sat, 18 Apr 2020 22:46:30 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jPwCe-0007XO-UI for linux-arm-kernel@lists.infradead.org; Sat, 18 Apr 2020 22:44:50 +0000 Received: by mail-wr1-x442.google.com with SMTP id k11so7415400wrp.5 for ; Sat, 18 Apr 2020 15:44:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DdH07t1k9/y181hGinDV6UTR/Vqce1FXEwc4JDSNUgo=; b=NIOfImqp3qpMP3D9X6b+JfPw8bgsFJJLKGc6iM/svj0msjDwQB4NHHi3x6j4+/9LfH w1b1LK8t9l4uX6A46YGmQt9P7ru+6QI+xL5hGLIjDyhD96hkoA66gyw/Pv/5p18m5+Y4 xRY0pBCRDt+5PJPsr7ebb/yiZLIhYulHfqXCtzMBkh3q/WYyNJa04dmF8j/pJW6NXyJN vevvk/QIj/SNZsEVXrY4FSFbnO9mofuC1CQR7oEzIEaF0jiBTZyZoTXhwAvlz3/ErcIh asUcS5rQUe+zij5OFyhR3VRoF3JCU71k/uGoT6ZnsFLFFlpK3aedMIrs0DB8za7JPK7y bQBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DdH07t1k9/y181hGinDV6UTR/Vqce1FXEwc4JDSNUgo=; b=qJbSxiE2T9oCVaGatBKQPgSng9t8HPEt48MA5eqnaOuFZaaUMfZhO+CGEcZQsEYefq hFmfwlqRNNNJ8Zra6w91w4BTvUfiqRXdaSKKq8BZhyRE0bXpURaAo7xUZIZyxBEsBf8f 5yaIV3gN808PDWYgqNeyIk+bIuptlAzMPnAAXXxIPCHC+zuswQuUWkzTuq54GygnMjoo 0xAnGUWE9O34hEnT7NFM2ANGQP14Dz3UIqnmodMnYbcBrI230DUJkIDhL1qspM1E36+S XXLx3X/b6wg3rA2VbQXNIX2o18Guxb08ZIuK0MC+le1G4Dvp7BsX196q0s8WKYx0nWDu 2MGQ== X-Gm-Message-State: AGi0Pua9T0laxzPqO2WTnjrLgk/jQtGN5hKBafip5INi6BbBHXW1ZVGf 8fmfUwyg+nKnvbz9+jC71nI= X-Google-Smtp-Source: APiQypKLBSnMaQwSZzz/e93DLQSKm39F96CERmHmKiJfEdeWuhNhNE+Fk3LRWI+U1wVer5IdoPcLQg== X-Received: by 2002:adf:f084:: with SMTP id n4mr11151919wro.252.1587249887329; Sat, 18 Apr 2020 15:44:47 -0700 (PDT) Received: from localhost.localdomain (91-167-199-67.subs.proxad.net. [91.167.199.67]) by smtp.gmail.com with ESMTPSA id t16sm13371559wmi.27.2020.04.18.15.44.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:44:46 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Liam Girdwood , Mark Brown , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v2 6/7] ASoC: sun4i-i2s: Adjust regmap settings Date: Sun, 19 Apr 2020 00:44:34 +0200 Message-Id: <20200418224435.23672-7-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418224435.23672-1-peron.clem@gmail.com> References: <20200418224435.23672-1-peron.clem@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200418_154449_068728_66D0ED5D X-CRM114-Status: GOOD ( 13.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Marcus Cooper , =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogTWFyY3VzIENvb3BlciA8Y29kZWtpcHBlckBnbWFpbC5jb20+CgpCeXBhc3MgdGhlIHJl Z21hcCBjYWNoZSB3aGVuIGZsdXNoaW5nIHRoZSBpMnMgRklGT3MgYW5kIG1vZGlmeSB0aGUgdGFi bGVzCnRvIHJlZmxlY3QgdGhpcy4KClNpZ25lZC1vZmYtYnk6IE1hcmN1cyBDb29wZXIgPGNvZGVr aXBwZXJAZ21haWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBDbMOpbWVudCBQw6lyb24gPHBlcm9uLmNs ZW1AZ21haWwuY29tPgotLS0KIHNvdW5kL3NvYy9zdW54aS9zdW40aS1pMnMuYyB8IDMxICsrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlvbnMo KyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NvdW5kL3NvYy9zdW54aS9zdW40aS1p MnMuYyBiL3NvdW5kL3NvYy9zdW54aS9zdW40aS1pMnMuYwppbmRleCA5Nzc4YWYzN2ZiY2EuLjkw NTNkMjkwZGQ4NyAxMDA2NDQKLS0tIGEvc291bmQvc29jL3N1bnhpL3N1bjRpLWkycy5jCisrKyBi L3NvdW5kL3NvYy9zdW54aS9zdW40aS1pMnMuYwpAQCAtOTIxLDcgKzkyMSw3IEBAIHN0YXRpYyBp bnQgc3VuNGlfaTJzX3NldF9mbXQoc3RydWN0IHNuZF9zb2NfZGFpICpkYWksIHVuc2lnbmVkIGlu dCBmbXQpCiBzdGF0aWMgdm9pZCBzdW40aV9pMnNfc3RhcnRfY2FwdHVyZShzdHJ1Y3Qgc3VuNGlf aTJzICppMnMpCiB7CiAJLyogRmx1c2ggUlggRklGTyAqLwotCXJlZ21hcF91cGRhdGVfYml0cyhp MnMtPnJlZ21hcCwgU1VONElfSTJTX0ZJRk9fQ1RSTF9SRUcsCisJcmVnbWFwX3dyaXRlX2JpdHMo aTJzLT5yZWdtYXAsIFNVTjRJX0kyU19GSUZPX0NUUkxfUkVHLAogCQkJICAgU1VONElfSTJTX0ZJ Rk9fQ1RSTF9GTFVTSF9SWCwKIAkJCSAgIFNVTjRJX0kyU19GSUZPX0NUUkxfRkxVU0hfUlgpOwog CkBAIC05NDIsNyArOTQyLDcgQEAgc3RhdGljIHZvaWQgc3VuNGlfaTJzX3N0YXJ0X2NhcHR1cmUo c3RydWN0IHN1bjRpX2kycyAqaTJzKQogc3RhdGljIHZvaWQgc3VuNGlfaTJzX3N0YXJ0X3BsYXli YWNrKHN0cnVjdCBzdW40aV9pMnMgKmkycykKIHsKIAkvKiBGbHVzaCBUWCBGSUZPICovCi0JcmVn bWFwX3VwZGF0ZV9iaXRzKGkycy0+cmVnbWFwLCBTVU40SV9JMlNfRklGT19DVFJMX1JFRywKKwly ZWdtYXBfd3JpdGVfYml0cyhpMnMtPnJlZ21hcCwgU1VONElfSTJTX0ZJRk9fQ1RSTF9SRUcsCiAJ CQkgICBTVU40SV9JMlNfRklGT19DVFJMX0ZMVVNIX1RYLAogCQkJICAgU1VONElfSTJTX0ZJRk9f Q1RSTF9GTFVTSF9UWCk7CiAKQEAgLTEwOTYsMTMgKzEwOTYsNyBAQCBzdGF0aWMgY29uc3Qgc3Ry dWN0IHNuZF9zb2NfY29tcG9uZW50X2RyaXZlciBzdW40aV9pMnNfY29tcG9uZW50ID0gewogCiBz dGF0aWMgYm9vbCBzdW40aV9pMnNfcmRfcmVnKHN0cnVjdCBkZXZpY2UgKmRldiwgdW5zaWduZWQg aW50IHJlZykKIHsKLQlzd2l0Y2ggKHJlZykgewotCWNhc2UgU1VONElfSTJTX0ZJRk9fVFhfUkVH OgotCQlyZXR1cm4gZmFsc2U7Ci0KLQlkZWZhdWx0OgotCQlyZXR1cm4gdHJ1ZTsKLQl9CisJcmV0 dXJuIHRydWU7CiB9CiAKIHN0YXRpYyBib29sIHN1bjRpX2kyc193cl9yZWcoc3RydWN0IGRldmlj ZSAqZGV2LCB1bnNpZ25lZCBpbnQgcmVnKQpAQCAtMTEyMSw2ICsxMTE1LDggQEAgc3RhdGljIGJv b2wgc3VuNGlfaTJzX3ZvbGF0aWxlX3JlZyhzdHJ1Y3QgZGV2aWNlICpkZXYsIHVuc2lnbmVkIGlu dCByZWcpCiB7CiAJc3dpdGNoIChyZWcpIHsKIAljYXNlIFNVTjRJX0kyU19GSUZPX1JYX1JFRzoK KwljYXNlIFNVTjRJX0kyU19GSUZPX1RYX1JFRzoKKwljYXNlIFNVTjRJX0kyU19GSUZPX1NUQV9S RUc6CiAJY2FzZSBTVU40SV9JMlNfSU5UX1NUQV9SRUc6CiAJY2FzZSBTVU40SV9JMlNfUlhfQ05U X1JFRzoKIAljYXNlIFNVTjRJX0kyU19UWF9DTlRfUkVHOgpAQCAtMTEzMSwyMyArMTEyNywxMiBA QCBzdGF0aWMgYm9vbCBzdW40aV9pMnNfdm9sYXRpbGVfcmVnKHN0cnVjdCBkZXZpY2UgKmRldiwg dW5zaWduZWQgaW50IHJlZykKIAl9CiB9CiAKLXN0YXRpYyBib29sIHN1bjhpX2kyc19yZF9yZWco c3RydWN0IGRldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcmVnKQotewotCXN3aXRjaCAocmVnKSB7 Ci0JY2FzZSBTVU44SV9JMlNfRklGT19UWF9SRUc6Ci0JCXJldHVybiBmYWxzZTsKLQotCWRlZmF1 bHQ6Ci0JCXJldHVybiB0cnVlOwotCX0KLX0KLQogc3RhdGljIGJvb2wgc3VuOGlfaTJzX3ZvbGF0 aWxlX3JlZyhzdHJ1Y3QgZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCByZWcpCiB7CiAJaWYgKHJl ZyA9PSBTVU44SV9JMlNfSU5UX1NUQV9SRUcpCiAJCXJldHVybiB0cnVlOwogCWlmIChyZWcgPT0g U1VOOElfSTJTX0ZJRk9fVFhfUkVHKQotCQlyZXR1cm4gZmFsc2U7CisJCXJldHVybiB0cnVlOwog CiAJcmV0dXJuIHN1bjRpX2kyc192b2xhdGlsZV9yZWcoZGV2LCByZWcpOwogfQpAQCAtMTIxOCw3 ICsxMjAzLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCByZWdtYXBfY29uZmlnIHN1bjhpX2kyc19y ZWdtYXBfY29uZmlnID0gewogCS5yZWdfZGVmYXVsdHMJPSBzdW44aV9pMnNfcmVnX2RlZmF1bHRz LAogCS5udW1fcmVnX2RlZmF1bHRzCT0gQVJSQVlfU0laRShzdW44aV9pMnNfcmVnX2RlZmF1bHRz KSwKIAkud3JpdGVhYmxlX3JlZwk9IHN1bjRpX2kyc193cl9yZWcsCi0JLnJlYWRhYmxlX3JlZwk9 IHN1bjhpX2kyc19yZF9yZWcsCisJLnJlYWRhYmxlX3JlZwk9IHN1bjRpX2kyc19yZF9yZWcsCiAJ LnZvbGF0aWxlX3JlZwk9IHN1bjhpX2kyc192b2xhdGlsZV9yZWcsCiB9OwogCkBAIC0xMjMxLDcg KzEyMTYsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHJlZ21hcF9jb25maWcgc3VuNTBpX2kyc19y ZWdtYXBfY29uZmlnID0gewogCS5yZWdfZGVmYXVsdHMJPSBzdW41MGlfaTJzX3JlZ19kZWZhdWx0 cywKIAkubnVtX3JlZ19kZWZhdWx0cwk9IEFSUkFZX1NJWkUoc3VuNTBpX2kyc19yZWdfZGVmYXVs dHMpLAogCS53cml0ZWFibGVfcmVnCT0gc3VuNGlfaTJzX3dyX3JlZywKLQkucmVhZGFibGVfcmVn CT0gc3VuOGlfaTJzX3JkX3JlZywKKwkucmVhZGFibGVfcmVnCT0gc3VuNGlfaTJzX3JkX3JlZywK IAkudm9sYXRpbGVfcmVnCT0gc3VuOGlfaTJzX3ZvbGF0aWxlX3JlZywKIH07CiAKLS0gCjIuMjAu MQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4 LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFk Lm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFy bS1rZXJuZWwK 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 X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1A23C2BA19 for ; Sat, 18 Apr 2020 22:44:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9194721D6C for ; Sat, 18 Apr 2020 22:44:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NIOfImqp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728350AbgDRWov (ORCPT ); Sat, 18 Apr 2020 18:44:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728342AbgDRWot (ORCPT ); Sat, 18 Apr 2020 18:44:49 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6CB2C061A0F; Sat, 18 Apr 2020 15:44:48 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id j1so1986236wrt.1; Sat, 18 Apr 2020 15:44:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DdH07t1k9/y181hGinDV6UTR/Vqce1FXEwc4JDSNUgo=; b=NIOfImqp3qpMP3D9X6b+JfPw8bgsFJJLKGc6iM/svj0msjDwQB4NHHi3x6j4+/9LfH w1b1LK8t9l4uX6A46YGmQt9P7ru+6QI+xL5hGLIjDyhD96hkoA66gyw/Pv/5p18m5+Y4 xRY0pBCRDt+5PJPsr7ebb/yiZLIhYulHfqXCtzMBkh3q/WYyNJa04dmF8j/pJW6NXyJN vevvk/QIj/SNZsEVXrY4FSFbnO9mofuC1CQR7oEzIEaF0jiBTZyZoTXhwAvlz3/ErcIh asUcS5rQUe+zij5OFyhR3VRoF3JCU71k/uGoT6ZnsFLFFlpK3aedMIrs0DB8za7JPK7y bQBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DdH07t1k9/y181hGinDV6UTR/Vqce1FXEwc4JDSNUgo=; b=WPDHdrZAzS6uIB7jMHpY5b2nWcaJfvPelnLHiVC2/lh5+TJsehJdh3mxLHrvj+g5iQ LOTnT8RZYpxrumZWmXHFhnHBCbIWDh2Wgdvsee8kAYCZity4w3P1YUa9hvUPw/dJeLPZ fkKc9pD3bfu5e6kNNojLw4gHqKUs6oPjdsVAlbIqFMq4FW5uEDDjK1Q5VTbgHPe5yQSt NPRJmpCVCLv1H3XxRKFzsCfMSPbDm8wZEuHmoCFfIERQKflSmtIEqRrubt1VZtC1l5/b YAKBBTXr1Zu23MDsSShk4QMtk/sF5gq6gu4mjpdBu/3TUcM8F84Q6zaoRbcDpQ/fjdaR +u5g== X-Gm-Message-State: AGi0PuZzdu0lqMQ8hqzeWMHnomRvAgZKCDPqY285RsMUvJM7QPLT42FB Qy6JBSBYUhz7/T4meerMQc8= X-Google-Smtp-Source: APiQypKLBSnMaQwSZzz/e93DLQSKm39F96CERmHmKiJfEdeWuhNhNE+Fk3LRWI+U1wVer5IdoPcLQg== X-Received: by 2002:adf:f084:: with SMTP id n4mr11151919wro.252.1587249887329; Sat, 18 Apr 2020 15:44:47 -0700 (PDT) Received: from localhost.localdomain (91-167-199-67.subs.proxad.net. [91.167.199.67]) by smtp.gmail.com with ESMTPSA id t16sm13371559wmi.27.2020.04.18.15.44.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2020 15:44:46 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= To: Liam Girdwood , Mark Brown , Rob Herring , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Marcus Cooper , =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Subject: [PATCH v2 6/7] ASoC: sun4i-i2s: Adjust regmap settings Date: Sun, 19 Apr 2020 00:44:34 +0200 Message-Id: <20200418224435.23672-7-peron.clem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200418224435.23672-1-peron.clem@gmail.com> References: <20200418224435.23672-1-peron.clem@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Marcus Cooper Bypass the regmap cache when flushing the i2s FIFOs and modify the tables to reflect this. Signed-off-by: Marcus Cooper Signed-off-by: Clément Péron --- sound/soc/sunxi/sun4i-i2s.c | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 9778af37fbca..9053d290dd87 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -921,7 +921,7 @@ static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) static void sun4i_i2s_start_capture(struct sun4i_i2s *i2s) { /* Flush RX FIFO */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_FIFO_CTRL_REG, + regmap_write_bits(i2s->regmap, SUN4I_I2S_FIFO_CTRL_REG, SUN4I_I2S_FIFO_CTRL_FLUSH_RX, SUN4I_I2S_FIFO_CTRL_FLUSH_RX); @@ -942,7 +942,7 @@ static void sun4i_i2s_start_capture(struct sun4i_i2s *i2s) static void sun4i_i2s_start_playback(struct sun4i_i2s *i2s) { /* Flush TX FIFO */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_FIFO_CTRL_REG, + regmap_write_bits(i2s->regmap, SUN4I_I2S_FIFO_CTRL_REG, SUN4I_I2S_FIFO_CTRL_FLUSH_TX, SUN4I_I2S_FIFO_CTRL_FLUSH_TX); @@ -1096,13 +1096,7 @@ static const struct snd_soc_component_driver sun4i_i2s_component = { static bool sun4i_i2s_rd_reg(struct device *dev, unsigned int reg) { - switch (reg) { - case SUN4I_I2S_FIFO_TX_REG: - return false; - - default: - return true; - } + return true; } static bool sun4i_i2s_wr_reg(struct device *dev, unsigned int reg) @@ -1121,6 +1115,8 @@ static bool sun4i_i2s_volatile_reg(struct device *dev, unsigned int reg) { switch (reg) { case SUN4I_I2S_FIFO_RX_REG: + case SUN4I_I2S_FIFO_TX_REG: + case SUN4I_I2S_FIFO_STA_REG: case SUN4I_I2S_INT_STA_REG: case SUN4I_I2S_RX_CNT_REG: case SUN4I_I2S_TX_CNT_REG: @@ -1131,23 +1127,12 @@ static bool sun4i_i2s_volatile_reg(struct device *dev, unsigned int reg) } } -static bool sun8i_i2s_rd_reg(struct device *dev, unsigned int reg) -{ - switch (reg) { - case SUN8I_I2S_FIFO_TX_REG: - return false; - - default: - return true; - } -} - static bool sun8i_i2s_volatile_reg(struct device *dev, unsigned int reg) { if (reg == SUN8I_I2S_INT_STA_REG) return true; if (reg == SUN8I_I2S_FIFO_TX_REG) - return false; + return true; return sun4i_i2s_volatile_reg(dev, reg); } @@ -1218,7 +1203,7 @@ static const struct regmap_config sun8i_i2s_regmap_config = { .reg_defaults = sun8i_i2s_reg_defaults, .num_reg_defaults = ARRAY_SIZE(sun8i_i2s_reg_defaults), .writeable_reg = sun4i_i2s_wr_reg, - .readable_reg = sun8i_i2s_rd_reg, + .readable_reg = sun4i_i2s_rd_reg, .volatile_reg = sun8i_i2s_volatile_reg, }; @@ -1231,7 +1216,7 @@ static const struct regmap_config sun50i_i2s_regmap_config = { .reg_defaults = sun50i_i2s_reg_defaults, .num_reg_defaults = ARRAY_SIZE(sun50i_i2s_reg_defaults), .writeable_reg = sun4i_i2s_wr_reg, - .readable_reg = sun8i_i2s_rd_reg, + .readable_reg = sun4i_i2s_rd_reg, .volatile_reg = sun8i_i2s_volatile_reg, }; -- 2.20.1