diff --git a/src/mainboard/google/trogdor/bootblock.c b/src/mainboard/google/trogdor/bootblock.c
index 710a2e7734..29aec5f917 100644
--- a/src/mainboard/google/trogdor/bootblock.c
+++ b/src/mainboard/google/trogdor/bootblock.c
@@ -2,7 +2,7 @@
 
 #include <bootblock_common.h>
 #include "board.h"
-#include <soc/qupv3_spi.h>
+#include <soc/qupv3_spi_common.h>
 
 void bootblock_mainboard_init(void)
 {
diff --git a/src/soc/qualcomm/sc7180/include/soc/qupv3_spi.h b/src/soc/qualcomm/common/include/soc/qupv3_spi_common.h
similarity index 100%
rename from src/soc/qualcomm/sc7180/include/soc/qupv3_spi.h
rename to src/soc/qualcomm/common/include/soc/qupv3_spi_common.h
diff --git a/src/soc/qualcomm/sc7180/qupv3_spi.c b/src/soc/qualcomm/common/qupv3_spi.c
similarity index 99%
rename from src/soc/qualcomm/sc7180/qupv3_spi.c
rename to src/soc/qualcomm/common/qupv3_spi.c
index 9cf05ab7b2..c69ecf9eaa 100644
--- a/src/soc/qualcomm/sc7180/qupv3_spi.c
+++ b/src/soc/qualcomm/common/qupv3_spi.c
@@ -1,14 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <assert.h>
-#include <console/console.h>
 #include <lib.h>
 #include <soc/clock.h>
 #include <soc/gpio.h>
 #include <soc/qcom_qup_se.h>
-#include <soc/qupv3_config_common.h>
 #include <soc/qup_se_handlers_common.h>
-#include <soc/qupv3_spi.h>
+#include <soc/qupv3_config_common.h>
+#include <soc/qupv3_spi_common.h>
 #include <types.h>
 
 /* SE_SPI_LOOPBACK register fields */
diff --git a/src/soc/qualcomm/sc7180/Makefile.inc b/src/soc/qualcomm/sc7180/Makefile.inc
index 0d7e4d62bd..8fb8b48e10 100644
--- a/src/soc/qualcomm/sc7180/Makefile.inc
+++ b/src/soc/qualcomm/sc7180/Makefile.inc
@@ -9,7 +9,7 @@ all-y += ../common/gpio.c
 all-y += ../common/spi.c
 all-$(CONFIG_SC7180_QSPI) += ../common/qspi.c
 all-y += ../common/qupv3_i2c.c
-all-y += qupv3_spi.c
+all-y += ../common/qupv3_spi.c
 all-y += clock.c
 all-y += ../common/clock.c
 all-y += qcom_qup_se.c
@@ -20,7 +20,6 @@ all-y += ../common/qup_se_handler.c
 bootblock-y += bootblock.c
 bootblock-y += mmu.c
 bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart_bitbang.c
-
 ################################################################################
 verstage-$(CONFIG_DRIVERS_UART) += qupv3_uart.c