soundwire: intel: cleanup IO control

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-10-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 a181070..a2e1927 100644 (file)
--- a/include/linux/soundwire/sdw_intel.h
+++ b/include/linux/soundwire/sdw_intel.h
@@ -63,11 +63,8 @@
 #define SDW_SHIM_PCMSYCM_STREAM                GENMASK(13, 8)
 #define SDW_SHIM_PCMSYCM_DIR           BIT(15)
 
+/* IO control */
 #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)
@@ -79,6 +76,11 @@
 #define SDW_SHIM_IOCTL_CIBD            BIT(8)
 #define SDW_SHIM_IOCTL_DIBD            BIT(9)
 
+#define SDW_SHIM_CTMCTL(x)             (0x06E + 0x60 * (x))
+
+#define SDW_SHIM_WAKEEN                        0x190
+#define SDW_SHIM_WAKESTS               0x192
+
 #define SDW_SHIM_CTMCTL_DACTQE         BIT(0)
 #define SDW_SHIM_CTMCTL_DODS           BIT(1)
 #define SDW_SHIM_CTMCTL_DOAIS          GENMASK(4, 3)