soundwire: intel: cleanup PCM stream capabilities

Regroup offset and bitfields

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-8-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 7c1d111..958628e 100644 (file)
--- a/include/linux/soundwire/sdw_intel.h
+++ b/include/linux/soundwire/sdw_intel.h
@@ -45,8 +45,13 @@
 #define SDW_SHIM_CTLS2CM(x)            (0x016 + 0x60 * (x))
 #define SDW_SHIM_CTLS3CM(x)            (0x018 + 0x60 * (x))
 
+/* PCM Stream capabilities */
 #define SDW_SHIM_PCMSCAP(x)            (0x020 + 0x60 * (x))
 
+#define SDW_SHIM_PCMSCAP_ISS           GENMASK(3, 0)
+#define SDW_SHIM_PCMSCAP_OSS           GENMASK(7, 4)
+#define SDW_SHIM_PCMSCAP_BSS           GENMASK(12, 8)
+
 #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))
@@ -55,10 +60,6 @@
 #define SDW_SHIM_WAKEEN                        0x190
 #define SDW_SHIM_WAKESTS               0x192
 
-#define SDW_SHIM_PCMSCAP_ISS           GENMASK(3, 0)
-#define SDW_SHIM_PCMSCAP_OSS           GENMASK(7, 4)
-#define SDW_SHIM_PCMSCAP_BSS           GENMASK(12, 8)
-
 #define SDW_SHIM_PCMSYCM_LCHN          GENMASK(3, 0)
 #define SDW_SHIM_PCMSYCM_HCHN          GENMASK(7, 4)
 #define SDW_SHIM_PCMSYCM_STREAM                GENMASK(13, 8)