git: 994c943a0098 - main - spibus: Move rockchip driver into the common directory

The branch main has been updated by manu:

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

commit 994c943a0098e38bff96f9f9169cbb38542c39c1
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-12-25 18:30:05 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2024-01-10 18:20:13 +0000

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

diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 21ad400bc2a7..fa7c4e6362c4 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -391,6 +391,8 @@ 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/rockchip/rk_spi.c		optional fdt rk_spi
+
 dev/uart/uart_cpu_arm64.c			optional uart
 dev/uart/uart_dev_mu.c				optional uart uart_mu fdt
 dev/uart/uart_dev_pl011.c			optional uart pl011
@@ -675,7 +677,6 @@ arm64/rockchip/rk_grf.c				optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_r
 arm64/rockchip/rk_pinctrl.c			optional fdt rk_pinctrl soc_rockchip_rk3328 | fdt rk_pinctrl soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
 arm64/rockchip/rk_gpio.c			optional fdt rk_gpio soc_rockchip_rk3328 | fdt rk_gpio soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
 arm64/rockchip/rk_iodomain.c			optional fdt rk_iodomain
-arm64/rockchip/rk_spi.c				optional fdt rk_spi
 arm64/rockchip/rk_usb2phy.c			optional fdt rk_usb2phy soc_rockchip_rk3328 | fdt rk_usb2phy soc_rockchip_rk3399 | fdt rk_usb2phy soc_rockchip_rk3568
 arm64/rockchip/rk_typec_phy.c			optional fdt rk_typec_phy soc_rockchip_rk3399
 arm64/rockchip/rk_tsadc_if.m			optional fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
diff --git a/sys/arm64/rockchip/rk_spi.c b/sys/dev/spibus/controller/rockchip/rk_spi.c
similarity index 100%
rename from sys/arm64/rockchip/rk_spi.c
rename to sys/dev/spibus/controller/rockchip/rk_spi.c
diff --git a/sys/modules/rockchip/rk_spi/Makefile b/sys/modules/rockchip/rk_spi/Makefile
index 614ea680ce56..70526cdaf2c2 100644
--- a/sys/modules/rockchip/rk_spi/Makefile
+++ b/sys/modules/rockchip/rk_spi/Makefile
@@ -1,5 +1,5 @@
 
-.PATH: ${SRCTOP}/sys/arm64/rockchip
+.PATH: ${SRCTOP}/sys/dev/spibus/controller/rockchip
 
 KMOD=	rk_spi
 SRCS=	rk_spi.c