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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 4ED41C2D0DB for ; Fri, 24 Jan 2020 11:29:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1AD3820718 for ; Fri, 24 Jan 2020 11:29:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865375; bh=6bAP1/fQ8VrkeQbOc2ijvm1jpksZ5lZVzR90RcIoTO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Nqxlp8z0RPYgwZAm0wxsNL0SQlBr1fjOI6fi6w8+8hsgo9UefVBy//PbQ3YFynqE8 PcypT1xnmCc6VLnlbzbQ/6ZpKUXXAXp5RtzFO5oBWdQeffVJ6HAfIylU4c+4SbVJfI IOXefwP4S/elQjVHR6kHxmbHal7u4rN57/mP5BYo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391816AbgAXL3e (ORCPT ); Fri, 24 Jan 2020 06:29:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:46356 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391801AbgAXL33 (ORCPT ); Fri, 24 Jan 2020 06:29:29 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 40F582075D; Fri, 24 Jan 2020 11:29:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865369; bh=6bAP1/fQ8VrkeQbOc2ijvm1jpksZ5lZVzR90RcIoTO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OA0i66kPzuRsWGdJWzH3H8nQpDj/xJNg4ooWOYWW5ocH1ywwR4ymTtZK7LUErHUlo 282rw1mMFWZVc6goU7tBTJQVETGa9cS/EpX8L6A8bjkm6Ve8LHZMLmy7zGHTTy/cTX vFfd5jFrGlk2Y+vfiiy7PVrZBdpZcNsizhgoS+K4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maxime Ripard , Mark Brown , Sasha Levin Subject: [PATCH 4.19 514/639] ASoC: sun4i-i2s: RX and TX counter registers are swapped Date: Fri, 24 Jan 2020 10:31:24 +0100 Message-Id: <20200124093153.187849107@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Maxime Ripard [ Upstream commit cf2c0e1ce9544df42170fb921f12da82dc0cc8d6 ] The RX and TX counters registers offset have been swapped, fix that. Fixes: fa7c0d13cb26 ("ASoC: sunxi: Add Allwinner A10 Digital Audio driver") Signed-off-by: Maxime Ripard Link: https://lore.kernel.org/r/8b26477560ad5fd8f69e037b167c5e61de5c26a3.1566242458.git-series.maxime.ripard@bootlin.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sunxi/sun4i-i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 18cf8404d27ca..f248e563986c3 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -80,8 +80,8 @@ #define SUN4I_I2S_CLK_DIV_MCLK_MASK GENMASK(3, 0) #define SUN4I_I2S_CLK_DIV_MCLK(mclk) ((mclk) << 0) -#define SUN4I_I2S_RX_CNT_REG 0x28 -#define SUN4I_I2S_TX_CNT_REG 0x2c +#define SUN4I_I2S_TX_CNT_REG 0x28 +#define SUN4I_I2S_RX_CNT_REG 0x2c #define SUN4I_I2S_TX_CHAN_SEL_REG 0x30 #define SUN4I_I2S_CHAN_SEL(num_chan) (((num_chan) - 1) << 0) -- 2.20.1