Commit 5c0d2562 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: intel: cleanup PCM Stream channel map and channel count 



Regroup offset and bitfield definitions.

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-9-yung-chuan.liao@linux.intel.com


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

include/linux/soundwire/sdw_intel.h

+9 −5
Original line number Diff line number Diff line
@@ -52,19 +52,23 @@ 
#define SDW_SHIM_PCMSCAP_OSS		GENMASK(7, 4)

#define SDW_SHIM_PCMSCAP_BSS		GENMASK(12, 8)



/* PCM Stream Channel Map */

#define SDW_SHIM_PCMSYCHM(x, y)		(0x022 + (0x60 * (x)) + (0x2 * (y)))

#define SDW_SHIM_PCMSYCHC(x, y)		(0x042 + (0x60 * (x)) + (0x2 * (y)))

#define SDW_SHIM_IOCTL(x)		(0x06C + 0x60 * (x))

#define SDW_SHIM_CTMCTL(x)		(0x06E + 0x60 * (x))



#define SDW_SHIM_WAKEEN			0x190

#define SDW_SHIM_WAKESTS		0x192

/* PCM Stream Channel Count */

#define SDW_SHIM_PCMSYCHC(x, y)		(0x042 + (0x60 * (x)) + (0x2 * (y)))



#define SDW_SHIM_PCMSYCM_LCHN		GENMASK(3, 0)

#define SDW_SHIM_PCMSYCM_HCHN		GENMASK(7, 4)

#define SDW_SHIM_PCMSYCM_STREAM		GENMASK(13, 8)

#define SDW_SHIM_PCMSYCM_DIR		BIT(15)



#define SDW_SHIM_IOCTL(x)		(0x06C + 0x60 * (x))

#define SDW_SHIM_CTMCTL(x)		(0x06E + 0x60 * (x))



#define SDW_SHIM_WAKEEN			0x190

#define SDW_SHIM_WAKESTS		0x192



#define SDW_SHIM_IOCTL_MIF		BIT(0)

#define SDW_SHIM_IOCTL_CO		BIT(1)

#define SDW_SHIM_IOCTL_COE		BIT(2)