diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -391,6 +391,7 @@
 dev/sram/mmio_sram.c				optional fdt mmio_sram
 dev/sram/mmio_sram_if.m				optional fdt mmio_sram
 
+dev/spibus/controller/allwinner/aw_spi.c	optional fdt aw_spi
 dev/spibus/controller/rockchip/rk_spi.c		optional fdt rk_spi
 
 dev/uart/uart_cpu_arm64.c			optional uart
@@ -444,7 +445,6 @@
 arm/allwinner/aw_rsb.c				optional aw_rsb fdt
 arm/allwinner/aw_rtc.c				optional aw_rtc fdt
 arm/allwinner/aw_sid.c				optional aw_sid nvmem fdt
-arm/allwinner/aw_spi.c				optional aw_spi fdt
 arm/allwinner/aw_syscon.c			optional aw_syscon syscon fdt
 arm/allwinner/aw_thermal.c			optional aw_thermal nvmem fdt
 arm/allwinner/aw_usbphy.c			optional ehci aw_usbphy fdt
diff --git a/sys/arm/allwinner/aw_spi.c b/sys/dev/spibus/controller/allwinner/aw_spi.c
rename from sys/arm/allwinner/aw_spi.c
rename to sys/dev/spibus/controller/allwinner/aw_spi.c
diff --git a/sys/modules/allwinner/aw_spi/Makefile b/sys/modules/allwinner/aw_spi/Makefile
--- a/sys/modules/allwinner/aw_spi/Makefile
+++ b/sys/modules/allwinner/aw_spi/Makefile
@@ -1,5 +1,5 @@
 
-.PATH: ${SRCTOP}/sys/arm/allwinner
+.PATH: ${SRCTOP}/sys/dev/spibus/controller/allwinner/
 
 KMOD=	aw_spi
 SRCS=	aw_spi.c