git: ec2b0ccdeed2 - main - spibus: Move allwinner driver into the common directory

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=ec2b0ccdeed2cbd3f49b7a992023c351e239389b

commit ec2b0ccdeed2cbd3f49b7a992023c351e239389b
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-12-25 18:33:02 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2024-01-10 18:20:15 +0000

    spibus: Move allwinner driver into the common directory
    
    No need to keep it under sys/arm/allwinner
    It's easier to find which controller we support by looking under one directory.
    
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
    Differential Revision:  https://reviews.freebsd.org/D43185
---
 sys/conf/files.arm64                                  | 2 +-
 sys/{arm => dev/spibus/controller}/allwinner/aw_spi.c | 0
 sys/modules/allwinner/aw_spi/Makefile                 | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index fa7c4e6362c4..1a141963a37e 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -391,6 +391,7 @@ dev/sdhci/sdhci_xenon_fdt.c			optional sdhci_xenon sdhci fdt
 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_r_intc.c			optional aw_r_intc fdt
 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
similarity index 100%
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
index e26ffd6589e5..3bab8c70e417 100644
--- 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