Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8046362ybl; Thu, 16 Jan 2020 09:42:42 -0800 (PST) X-Google-Smtp-Source: APXvYqyasVbt9WB7/8hzCxOADeaCN3QKPnvGtp4r+vFdpTPDK+cwQwxNxDWDOIKODc7y0XFPEoh7 X-Received: by 2002:a9d:7d09:: with SMTP id v9mr3095158otn.338.1579196562321; Thu, 16 Jan 2020 09:42:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579196562; cv=none; d=google.com; s=arc-20160816; b=nV9tMlukX6OtVraUCxzpQdrDyMnr+xICri4CkRrSdsFFLirduvSPoexEUTXq1tIVWl 5dZKHSb4mRWhgrAQDx9IjUu111GFBOt9ir7PWhrcBjEUhl33tQpI3Fm4xvf+sIPOL5wH 4l3k8+0ipAmuh2AvQmjsHEt3l0STIWtX6YORkVYKrTU2vQlN8rfk2/+EHOAK/Mwrz9kB d/tXilVW84lsXV6wwQ6atPIH50uMRJLWVscdJkvb8L6n9aI3P2qS9WLZI+cb5yv5KXy9 DBD7oO6u9qkNrXDqEd6WmDVuSGqgZB+YmJvU2N8oZKTV1Oj04bVO2Vg4PwKkdAPxCpcw Qugw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=m6I0ZUU2SQfaU0vdEtg3jmwH7pHWwYdZJJzkiju7Ajc=; b=AsSqLyq9vRCcEu2qtB5r0AsrfpT8uX1YlVxrr8KySEcD+zNt5plBaTyZdzUtCSCord 1VSJf3wOP2zDS0nR0Pz9X+KICWTtsUaX9gUIgn1PqFSadUojbCAweRg8v0J8KY0suDwd CiAZ3kJXkjm8Rpoi69r2vl0US3CIqvYgSf1fdQUteBHlSrPpGSqb7K0ChLmu2U1iEADU VQhcPFgWcENP0IJoBtlwyZ3Zjbqp7vWEMR5RjcJRv0/JBPGrOe+snovUa6LVrLg4cUOo jH6Cv+XlpkWnNFfeppSL0Q0wqAbdxmTya2xjXgMZQSG2y4xh8JVP5BOKipcCjX5dYVra MQ/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dGUZY0Jt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o206si11835536oih.143.2020.01.16.09.42.29; Thu, 16 Jan 2020 09:42:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dGUZY0Jt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405594AbgAPRlK (ORCPT + 99 others); Thu, 16 Jan 2020 12:41:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:57192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388484AbgAPRkL (ORCPT ); Thu, 16 Jan 2020 12:40:11 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6354E24705; Thu, 16 Jan 2020 17:40:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196411; bh=AiKD26N73+dcE/BuuQ0MMJHJKa0NJr0JAFQM6yaVb+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dGUZY0JtOXbp5lvM/O/I7AhqCEmdFf0VYlRksCtJk0h1dO8TTjZrTO35iw7ioP322 K/5D7G6QHfWZPp9rof/sr4adD9j7C3zRWd3fI4QT1cfrOZzT2iI9Ii2lCVFY1h9NBl wMvaMI/PAiOPJxxzJKAtE4DKaUqnMva3TWnNHeYg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maxime Ripard , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.9 184/251] ASoC: sun4i-i2s: RX and TX counter registers are swapped Date: Thu, 16 Jan 2020 12:35:33 -0500 Message-Id: <20200116173641.22137-144-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 15c92400cea4..02c373c65e19 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