[PATCH 04/11] ASoC: Intel: avs: Small registers cleanup

[Cezary Rojewski <cezary.rojewski@intel.com>]

Sort the HIPC registers - HIPCT comes before HIPCI. Also for
readability reasons, reword the ADSP interface version constants.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/soc/intel/avs/messages.h  | 4 ++--
 sound/soc/intel/avs/registers.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/avs/messages.h b/sound/soc/intel/avs/messages.h
index 55c04b0142ae..f8407b917c00 100644
--- a/sound/soc/intel/avs/messages.h
+++ b/sound/soc/intel/avs/messages.h
@@ -502,8 +502,8 @@ enum avs_hw_cfg_params {
 };
 
 enum avs_iface_version {
-	AVS_AVS_VER_1_5 = 0x10005,
-	AVS_AVS_VER_1_8 = 0x10008,
+	AVS_IFACE_VER_1_5 = 0x10005,
+	AVS_IFACE_VER_1_8 = 0x10008,
 };
 
 enum avs_i2s_version {
diff --git a/sound/soc/intel/avs/registers.h b/sound/soc/intel/avs/registers.h
index 97767882ffa1..c80207652fab 100644
--- a/sound/soc/intel/avs/registers.h
+++ b/sound/soc/intel/avs/registers.h
@@ -50,9 +50,9 @@
 #define SKL_ADSP_REG_HIPCIE		(SKL_ADSP_IPC_BASE + 0x0C)
 #define SKL_ADSP_REG_HIPCCTL		(SKL_ADSP_IPC_BASE + 0x10)
 
+#define SKL_ADSP_HIPCT_BUSY		BIT(31)
 #define SKL_ADSP_HIPCI_BUSY		BIT(31)
 #define SKL_ADSP_HIPCIE_DONE		BIT(30)
-#define SKL_ADSP_HIPCT_BUSY		BIT(31)
 
 /* CNL Intel HD Audio Inter-Processor Communication Registers */
 #define CNL_ADSP_IPC_BASE               0xC0
-- 
2.34.1