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 CE33EC33CB2 for ; Tue, 28 Jan 2020 14:22:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B92924686 for ; Tue, 28 Jan 2020 14:22:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221347; bh=96SgEAgr6ueX9E0YESGVCFy9dx3Ny4bQ+JLx/imZpLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SIJLreEsDI4u51JRo6JhJ5Fg3gRI81WmaLHmeY4arsO4zKDs6u095Y4/goBok4ztg djQpsetL5TALAdN5MzZjwWHWJD1CZLpN9t8BMGf9l51Wl6MrtaJ0kJb27HEpxGTQoP Zz7wHfNwbrnjUgZqJ+iq+Tjl8uuYSn1qR5zIDhCY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731257AbgA1OW1 (ORCPT ); Tue, 28 Jan 2020 09:22:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:48144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727549AbgA1OWV (ORCPT ); Tue, 28 Jan 2020 09:22:21 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 19A1524693; Tue, 28 Jan 2020 14:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221340; bh=96SgEAgr6ueX9E0YESGVCFy9dx3Ny4bQ+JLx/imZpLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V5yMpRtjGCaq9LBhk8eS6b9Nuzhl7qx3WIN7NzD0pT2FpdfHbR59ocKSi1iJ/Tv13 NuP8Ly+IzC/bOY8VVeUL5gZnGJwVHBqiHOuRqyHfTfSkkIL2alOwUOkf1ZX00cdwWV hC2hfwqfsb8d6pBq9j1T5IqxDKaC2hT+5KEf4QvQ= 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.9 184/271] ASoC: sun4i-i2s: RX and TX counter registers are swapped Date: Tue, 28 Jan 2020 15:05:33 +0100 Message-Id: <20200128135906.265270066@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@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 15c92400cea42..02c373c65e194 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -78,8 +78,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_TX_CHAN_SEL(num_chan) (((num_chan) - 1) << 0) -- 2.20.1