From 9ac2c214ebf894064f2d2cf6319db4e1c77706c2 Mon Sep 17 00:00:00 2001
From: Andy Ross <andrew.j.ross@intel.com>
Date: Sat, 11 Dec 2021 11:40:49 -0800
Subject: [PATCH] soc/intel_adsp: Remove adsp/io.h

More dead code.

Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
---
 drivers/ipm/ipm_cavs_idc.c                    |  4 +--
 soc/xtensa/intel_adsp/common/boot.c           |  1 -
 .../intel_adsp/common/include/adsp/io.h       | 27 -------------------
 soc/xtensa/intel_adsp/common/soc_mp.c         |  1 -
 4 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 soc/xtensa/intel_adsp/common/include/adsp/io.h

diff --git a/drivers/ipm/ipm_cavs_idc.c b/drivers/ipm/ipm_cavs_idc.c
index fac3069b15e..9d0398cd946 100644
--- a/drivers/ipm/ipm_cavs_idc.c
+++ b/drivers/ipm/ipm_cavs_idc.c
@@ -14,9 +14,7 @@
 
 #include <soc.h>
 
-#ifndef CONFIG_SOC_INTEL_S1000
-#include <adsp/io.h>
-#else
+#ifdef CONFIG_SOC_INTEL_S1000
 #include <soc/shim.h>
 #endif
 
diff --git a/soc/xtensa/intel_adsp/common/boot.c b/soc/xtensa/intel_adsp/common/boot.c
index c28f8cea837..39ad3eb3883 100644
--- a/soc/xtensa/intel_adsp/common/boot.c
+++ b/soc/xtensa/intel_adsp/common/boot.c
@@ -6,7 +6,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <adsp/io.h>
 #include <soc.h>
 #include <arch/xtensa/cache.h>
 #include <cavs-shim.h>
diff --git a/soc/xtensa/intel_adsp/common/include/adsp/io.h b/soc/xtensa/intel_adsp/common/include/adsp/io.h
deleted file mode 100644
index d0110f2d73b..00000000000
--- a/soc/xtensa/intel_adsp/common/include/adsp/io.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright(c) 2016 Intel Corporation. All rights reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
- */
-
-#ifndef __INCLUDE_IO__
-#define __INCLUDE_IO__
-
-#include <stdint.h>
-#include <sys/sys_io.h>
-#include <arch/common/sys_io.h>
-
-static inline uint32_t io_reg_read(uint32_t reg)
-{
-	return sys_read32(reg);
-}
-
-static inline void io_reg_write(uint32_t reg, uint32_t val)
-{
-	/* Note: Parameters in different order */
-	sys_write32(val, reg);
-}
-
-#endif
diff --git a/soc/xtensa/intel_adsp/common/soc_mp.c b/soc/xtensa/intel_adsp/common/soc_mp.c
index 798db0827d2..2d099e7cad0 100644
--- a/soc/xtensa/intel_adsp/common/soc_mp.c
+++ b/soc/xtensa/intel_adsp/common/soc_mp.c
@@ -20,7 +20,6 @@ LOG_MODULE_REGISTER(soc_mp, CONFIG_SOC_LOG_LEVEL);
 #include <cavs-idc.h>
 #include <soc.h>
 #include <arch/xtensa/cache.h>
-#include <adsp/io.h>
 #include <cavs-shim.h>
 #include <cavs-mem.h>
 #include <cpu_init.h>