Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp4397625pxv; Tue, 27 Jul 2021 06:30:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEG6AmMn5h/tOPXHAFbBuGFzLcLeJfMfDvdPK3KpeuhuKpptKdT05c5gCCzJ9Xw1Vqlgvn X-Received: by 2002:a02:c013:: with SMTP id y19mr21700485jai.36.1627392622297; Tue, 27 Jul 2021 06:30:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627392622; cv=none; d=google.com; s=arc-20160816; b=xAXheNwqQXcPidmEze9lrGroyvKquyV4zbHFaZVbxtsPhjvMcGO+MpOPv4YY+bg0BM AY0uMDqShti48Ddb+Ow5XlSUcWPzCUqnUfiD0XvXk9XALzLMTAX9tjysCiBRIy77noB6 r9Hm6zojWlY30cItFSh1P/nTC55IC8Ji14g95Y3vYrf25zf816SvCBHMa9MwR9R11AM+ WTSmQoRoGJINcVxRJ77RxoW7AJxwPSrqtc+QvELby/VE5qgWKjJ7YnmnbRk/uH5v1bAB PCeMioW8pQHL5ez/xRUK1JrbqwSFGl2vuRE7OVMeA2dFSar8FZtXU06U1EawYB6zuU3J 87QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NEzyeb+R9AM8xSAKXfjdxd9r4P5lkboDwUwKSU/MKqA=; b=WlYg9+MNGvm5fb/Uzha9BrSoiBf6C3xPI0EyRwQf+J7FiSroZNvdyHQzGocfIbeFfg Kh0V4mlIF5OemPrtQhW1FBA2z6lUQkUdiKHTW2C28nwKzcmJa5Lnjkw4/TZBucliYyI8 9JKwYQF3LXcrShGf+qISRrHvjSWBe7FxpJY9jUNJ/mLa0iGk8wf4ARepI5hci45HYN4q BZZF4bwJyaURV5Jdgf6Pz0+Clg9b1u+w9RbvVmhJ90mBCVZQVYwIhE87l4/EIxjGvCtr WQtDqJmCT7JinEieuq3YVcfNvPmNDU8Jtn1rVePLC4j2Ahd+bKKOJAj2UMQ5WHmvlk/r PFww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HrbL2d0R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id j2si2889352ilo.119.2021.07.27.06.30.10; Tue, 27 Jul 2021 06:30:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HrbL2d0R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S236876AbhG0N2B (ORCPT + 99 others); Tue, 27 Jul 2021 09:28:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:56510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236973AbhG0NUd (ORCPT ); Tue, 27 Jul 2021 09:20:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D34C161A8C; Tue, 27 Jul 2021 13:20:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627392018; bh=clXpkkKYs0rFca8LLDbeSbQ7rs6gT7Z2YGaHBpBxeRc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HrbL2d0R6xsLqrXAGA/llhFB5fsUfNf2GXWuhkhYCiUHgjSy8fFKmj1QNgYcKTKic cjV8FLmrP5qBDy24TuT6CjAFyDJI5xsY7ee7v+jcuRA//Zu817v+8DsYLVGMVvoJbS 0nrM0gD1ga5R/lSZUYz6SLB76oofAPLl3GBeYoVpobEXrJ/oDzHq93XSdEU2nfTp9x dNOy72F5L3lRX+f8szEoBSm0EyFYMJqYKBTTfmD+Jq5Pu4HdvXPsYq/NtWMa3xvNp8 +2vd6DjfytqlvZi5u0Zq//azxKa5lKjGuKCpXYBfSaC7JvVIYP8AjZmcHxJkFgl+fo bHgKxhYviCZng== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kyle Russell , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 4.19 2/6] ASoC: tlv320aic31xx: fix reversed bclk/wclk master bits Date: Tue, 27 Jul 2021 09:20:11 -0400 Message-Id: <20210727132015.835651-2-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210727132015.835651-1-sashal@kernel.org> References: <20210727132015.835651-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kyle Russell [ Upstream commit 9cf76a72af6ab81030dea6481b1d7bdd814fbdaf ] These are backwards from Table 7-71 of the TLV320AIC3100 spec [1]. This was broken in 12eb4d66ba2e when BCLK_MASTER and WCLK_MASTER were converted from 0x08 and 0x04 to BIT(2) and BIT(3), respectively. -#define AIC31XX_BCLK_MASTER 0x08 -#define AIC31XX_WCLK_MASTER 0x04 +#define AIC31XX_BCLK_MASTER BIT(2) +#define AIC31XX_WCLK_MASTER BIT(3) Probably just a typo since the defines were not listed in bit order. [1] https://www.ti.com/lit/gpn/tlv320aic3100 Signed-off-by: Kyle Russell Link: https://lore.kernel.org/r/20210622010941.241386-1-bkylerussell@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/tlv320aic31xx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h index 0b587585b38b..6071de5fca57 100644 --- a/sound/soc/codecs/tlv320aic31xx.h +++ b/sound/soc/codecs/tlv320aic31xx.h @@ -147,8 +147,8 @@ struct aic31xx_pdata { #define AIC31XX_WORD_LEN_24BITS 0x02 #define AIC31XX_WORD_LEN_32BITS 0x03 #define AIC31XX_IFACE1_MASTER_MASK GENMASK(3, 2) -#define AIC31XX_BCLK_MASTER BIT(2) -#define AIC31XX_WCLK_MASTER BIT(3) +#define AIC31XX_BCLK_MASTER BIT(3) +#define AIC31XX_WCLK_MASTER BIT(2) /* AIC31XX_DATA_OFFSET */ #define AIC31XX_DATA_OFFSET_MASK GENMASK(7, 0) -- 2.30.2