From f215d5e05243e478466ff17157e8732fc95fe7e4 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Date: Wed, 7 Oct 2020 08:16:30 +0200
Subject: [PATCH] cavs: explicitly include <cavs/version.h> where needed

To use CAVS_VERSION* macros the <cavs/version.h> header has to be
included. Also remove superfluous empty lines from that header.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
 src/drivers/intel/ssp/mn.c                                      | 2 ++
 .../intel/cavs/include/cavs/lib/asm_memory_management.h         | 2 ++
 src/platform/intel/cavs/include/cavs/version.h                  | 2 --
 src/platform/intel/cavs/lib/clk.c                               | 2 ++
 src/platform/intel/cavs/lib/pm_runtime.c                        | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/drivers/intel/ssp/mn.c b/src/drivers/intel/ssp/mn.c
index 3165272d9..31e638c6a 100644
--- a/src/drivers/intel/ssp/mn.c
+++ b/src/drivers/intel/ssp/mn.c
@@ -14,6 +14,8 @@
 #include <sof/spinlock.h>
 #include <sof/trace/trace.h>
 
+#include <cavs/version.h>
+
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/src/platform/intel/cavs/include/cavs/lib/asm_memory_management.h b/src/platform/intel/cavs/include/cavs/lib/asm_memory_management.h
index 05a32a88f..0e50f72b8 100644
--- a/src/platform/intel/cavs/include/cavs/lib/asm_memory_management.h
+++ b/src/platform/intel/cavs/include/cavs/lib/asm_memory_management.h
@@ -20,6 +20,8 @@
 #warning "The file is intended to be included in assembly files only."
 #endif
 
+#include <cavs/version.h>
+
 #include <sof/lib/memory.h>
 #include <sof/lib/shim.h>
 
diff --git a/src/platform/intel/cavs/include/cavs/version.h b/src/platform/intel/cavs/include/cavs/version.h
index f19e424a2..f3425bb04 100644
--- a/src/platform/intel/cavs/include/cavs/version.h
+++ b/src/platform/intel/cavs/include/cavs/version.h
@@ -8,8 +8,6 @@
 #ifndef __CAVS_VERSION_H__
 #define __CAVS_VERSION_H__
 
-
-
 #define CAVS_VERSION_1_5 0x10500
 #define CAVS_VERSION_1_8 0x10800
 #define CAVS_VERSION_2_0 0x20000
diff --git a/src/platform/intel/cavs/lib/clk.c b/src/platform/intel/cavs/lib/clk.c
index 50c777567..7778776fb 100644
--- a/src/platform/intel/cavs/lib/clk.c
+++ b/src/platform/intel/cavs/lib/clk.c
@@ -13,6 +13,8 @@
 #include <sof/sof.h>
 #include <sof/spinlock.h>
 
+#include <cavs/version.h>
+
 static SHARED_DATA struct clock_info platform_clocks_info[NUM_CLOCKS];
 
 #if CAVS_VERSION == CAVS_VERSION_1_5
diff --git a/src/platform/intel/cavs/lib/pm_runtime.c b/src/platform/intel/cavs/lib/pm_runtime.c
index 00db70149..638ace8b9 100644
--- a/src/platform/intel/cavs/lib/pm_runtime.c
+++ b/src/platform/intel/cavs/lib/pm_runtime.c
@@ -13,6 +13,7 @@
  */
 
 #include <cavs/lib/pm_memory.h>
+#include <cavs/version.h>
 #include <sof/debug/panic.h>
 #include <sof/drivers/interrupt.h>
 #include <sof/lib/alloc.h>