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 -#ifndef CONFIG_SOC_INTEL_S1000 -#include -#else +#ifdef CONFIG_SOC_INTEL_S1000 #include #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 #include -#include #include #include #include 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 - */ - -#ifndef __INCLUDE_IO__ -#define __INCLUDE_IO__ - -#include -#include -#include - -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 #include #include -#include #include #include #include