From: Bard Liao <yung-chuan.liao@linux.intel.com>
To: alsa-devel@alsa-project.org, vkoul@kernel.org
Cc: vinod.koul@linaro.org, linux-kernel@vger.kernel.org,
pierre-louis.bossart@linux.intel.com, bard.liao@intel.com
Subject: [PATCH 01/11] soundwire: intel: cleanup definition of LCOUNT
Date: Tue, 23 Aug 2022 13:38:36 +0800 [thread overview]
Message-ID: <20220823053846.2684635-2-yung-chuan.liao@linux.intel.com> (raw)
In-Reply-To: <20220823053846.2684635-1-yung-chuan.liao@linux.intel.com>
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Add definition in header file rather than hidden in code.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
drivers/soundwire/intel.c | 2 +-
drivers/soundwire/intel_init.c | 2 +-
include/linux/soundwire/sdw_intel.h | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 0c6e674dbf85..c37121356e06 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -138,7 +138,7 @@ static int intel_reg_show(struct seq_file *s_file, void *data)
if (!buf)
return -ENOMEM;
- links = intel_readl(s, SDW_SHIM_LCAP) & GENMASK(2, 0);
+ links = intel_readl(s, SDW_SHIM_LCAP) & SDW_SHIM_LCAP_LCOUNT_MASK;
ret = scnprintf(buf, RD_BUF, "Register Value\n");
ret += scnprintf(buf + ret, RD_BUF - ret, "\nShim\n");
diff --git a/drivers/soundwire/intel_init.c b/drivers/soundwire/intel_init.c
index 824f4f32d4dc..d091513919df 100644
--- a/drivers/soundwire/intel_init.c
+++ b/drivers/soundwire/intel_init.c
@@ -306,7 +306,7 @@ sdw_intel_startup_controller(struct sdw_intel_ctx *ctx)
/* Check SNDWLCAP.LCOUNT */
caps = ioread32(ctx->mmio_base + ctx->shim_base + SDW_SHIM_LCAP);
- caps &= GENMASK(2, 0);
+ caps &= SDW_SHIM_LCAP_LCOUNT_MASK;
/* Check HW supported vs property value */
if (caps < ctx->count) {
diff --git a/include/linux/soundwire/sdw_intel.h b/include/linux/soundwire/sdw_intel.h
index ec16ae49e6a4..49a3c265529b 100644
--- a/include/linux/soundwire/sdw_intel.h
+++ b/include/linux/soundwire/sdw_intel.h
@@ -15,7 +15,10 @@
#define SDW_LINK_SIZE 0x10000
/* Intel SHIM Registers Definition */
+/* LCAP */
#define SDW_SHIM_LCAP 0x0
+#define SDW_SHIM_LCAP_LCOUNT_MASK GENMASK(2, 0)
+
#define SDW_SHIM_LCTL 0x4
#define SDW_SHIM_IPPTR 0x8
#define SDW_SHIM_SYNC 0xC
--
2.25.1
next prev parent reply other threads:[~2022-08-23 5:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-23 5:38 [PATCH 00/11] soundwire: register cleanups Bard Liao
2022-08-23 5:38 ` Bard Liao [this message]
2022-08-23 5:38 ` [PATCH 02/11] soundwire: intel: regroup definitions for LCTL Bard Liao
2022-08-23 5:38 ` [PATCH 03/11] soundwire: intel: remove IPPTR unused definition Bard Liao
2022-08-23 5:38 ` [PATCH 04/11] soundwire: intel: cleanup SHIM SYNC Bard Liao
2022-08-23 5:38 ` [PATCH 05/11] soundwire: intel: remove unused PDM capabilities Bard Liao
2022-08-23 5:38 ` [PATCH 06/11] soundwire: intel: add comment for control stream cap/chmap Bard Liao
2022-08-23 5:38 ` [PATCH 07/11] soundwire: intel: cleanup PCM stream capabilities Bard Liao
2022-08-23 5:38 ` [PATCH 08/11] soundwire: intel: cleanup PCM Stream channel map and channel count Bard Liao
2022-08-23 5:38 ` [PATCH 09/11] soundwire: intel: cleanup IO control Bard Liao
2022-08-23 5:38 ` [PATCH 10/11] soundwire: intel: cleanup AC Timing Control Bard Liao
2022-08-23 5:38 ` [PATCH 11/11] soundwire: intel: cleanup WakeEnable and WakeStatus Bard Liao
2022-08-30 4:49 ` [PATCH 00/11] soundwire: register cleanups Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220823053846.2684635-2-yung-chuan.liao@linux.intel.com \
--to=yung-chuan.liao@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=bard.liao@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=vinod.koul@linaro.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®