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=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 45F79C2D0DB for ; Fri, 24 Jan 2020 10:03:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A99E21556 for ; Fri, 24 Jan 2020 10:03:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860182; bh=RV5vHIW/JukwiAu3/xnkygDHjWUT+DzBRQLmiYXxBJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=z9PU/OMrwNDcQEQedFvQk4krTN+cN4wwg7C4eCr5h3b1EprDULEkUs62HyHZEc+l+ DF8OU+AeStXkOkgElCss4Vhj69+EA1fTf2BhSjCnc1kBmHP3hMJ0RwzvRyqmog/RH1 dhv+r3KCH5NY/9bjbSO3EaKUZmqtx7CiVHv0Pa2c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733173AbgAXKC4 (ORCPT ); Fri, 24 Jan 2020 05:02:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:38530 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733075AbgAXKCz (ORCPT ); Fri, 24 Jan 2020 05:02:55 -0500 Received: from localhost (unknown [145.15.244.15]) (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 B437D208C4; Fri, 24 Jan 2020 10:02:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860175; bh=RV5vHIW/JukwiAu3/xnkygDHjWUT+DzBRQLmiYXxBJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TUp0Ak51OpW/jP8ZrdPrd1GjY9g8MzyQpH3/GbS8JkgN3xzj/xVBQleQgQCYpTBQP JyG0QZqTZmmK+cJHIc9MmgGUz+TWD6edMzLMXlE99QpEO8IIPWkHdkcru7ANqDRLAA wCXf0waQ8lzllnSXXBQXVgg1HtlSaojzfHnzCKH8= 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.14 276/343] ASoC: sun4i-i2s: RX and TX counter registers are swapped Date: Fri, 24 Jan 2020 10:31:34 +0100 Message-Id: <20200124092956.302156190@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 da0a2083e12af..d2802fd8c1dd7 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