Commit 7f817068 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: intel: cleanup definition of LCOUNT 



Add definition in header file rather than hidden in code.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220823053846.2684635-2-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 1f2dcf3a

drivers/soundwire/intel.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

drivers/soundwire/intel_init.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

include/linux/soundwire/sdw_intel.h

+3 −0
Original line number Diff line number Diff line
@@ -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