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

Regroup offset and bitfield definitions.

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>
Link: https://lore.kernel.org/r/20220823053846.2684635-9-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/include/linux/soundwire/sdw_intel.h b/include/linux/soundwire/sdw_intel.h
index 958628e..a181070 100644 (file)
--- a/include/linux/soundwire/sdw_intel.h
+++ b/include/linux/soundwire/sdw_intel.h
@@ -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)