From patchwork Wed May 4 14:54:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Keeping X-Patchwork-Id: 9015711 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 64C609F1C1 for ; Wed, 4 May 2016 15:02:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7CF102039C for ; Wed, 4 May 2016 15:02:37 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 52D85203A0 for ; Wed, 4 May 2016 15:02:30 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id A89C9265DFF; Wed, 4 May 2016 17:02:28 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, NO_DNS_FOR_FROM,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 818B1265AF0; Wed, 4 May 2016 16:58:50 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 6F772265AE5; Wed, 4 May 2016 16:58:49 +0200 (CEST) Received: from metanate.com (dougal.metanate.com [90.155.101.14]) by alsa0.perex.cz (Postfix) with ESMTP id DA6D0265A79 for ; Wed, 4 May 2016 16:55:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=metanate.com; s=stronger; h=Message-Id:Date:Subject:Cc:To:From; bh=sfQSCAMjSs4AfyghYA8/FmOE/rUU/yHI3ebd4Xq4QQU=; b=MytX5UnqWFFIy1lf4tFRPD7u5Na65Vo29cNTDOwvgUSFAs2H+KgofLV8wTN6XfYbbeAZvEMgaKd/aTfWAy0zNfoqMoxcjcE5HwnezEyfbo6AtKo4QIKR8XTTLKo+uEfsbf8UrFRQmIywYKwiIpypfqbKxw0Q295ha9iri+3WEy3GsP63WgQjOFqxUZ8GX2QvmG+Z1qqPvzn2CVRkWokOOXS3LkzIoR9Dl/iwReUEwQoll7pLWMIETPpjUNVJIfgunvKcrLv9O7Q1IbAmKpPEv4u3HqwX5LFCySZcuDUyusDUAwxyD5mgOHmt2tqkHKOxGqaq6Px9bvbve0b2h1sQwA==; Received: from brian ([192.168.88.1] helo=leela.metanate.com) by shrek.metanate.com with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.83_RC2) (envelope-from ) id 1axyCd-0007bj-Va; Wed, 04 May 2016 15:55:04 +0100 From: John Keeping To: alsa-devel@alsa-project.org Date: Wed, 4 May 2016 15:54:45 +0100 Message-Id: <1462373686-21794-1-git-send-email-john@metanate.com> X-Mailer: git-send-email 2.8.0.rc4.238.g874082a Cc: Heiko Stuebner , Enric Balletbo Serra , linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood , linux-rockchip@lists.infradead.org, Mark Brown , John Keeping , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH 1/2] Revert "ASoC: rockchip: i2s: remove unused variables" X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 5938448b99275cba95167c3f9d39ca9225fdad38. It turns out that the commit that made these variables unused is wrong so we're about to revert it. Bring back the variables in prepration. Signed-off-by: John Keeping --- sound/soc/rockchip/rockchip_i2s.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 2f8e20416bd3..34743ec61c49 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -34,6 +34,13 @@ struct rk_i2s_dev { struct regmap *regmap; +/* + * Used to indicate the tx/rx status. + * I2S controller hopes to start the tx and rx together, + * also to stop them when they are both try to stop. +*/ + bool tx_start; + bool rx_start; bool is_master_mode; }; @@ -77,7 +84,11 @@ static void rockchip_snd_txctrl(struct rk_i2s_dev *i2s, int on) regmap_update_bits(i2s->regmap, I2S_XFER, I2S_XFER_TXS_START, I2S_XFER_TXS_START); + + i2s->tx_start = true; } else { + i2s->tx_start = false; + regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_TDE_ENABLE, I2S_DMACR_TDE_DISABLE); @@ -115,7 +126,11 @@ static void rockchip_snd_rxctrl(struct rk_i2s_dev *i2s, int on) regmap_update_bits(i2s->regmap, I2S_XFER, I2S_XFER_RXS_START, I2S_XFER_RXS_START); + + i2s->rx_start = true; } else { + i2s->rx_start = false; + regmap_update_bits(i2s->regmap, I2S_DMACR, I2S_DMACR_RDE_ENABLE, I2S_DMACR_RDE_DISABLE);