git: 3c2b2a28b9c1 - main - iicbus: Move rockchip driver into the common directory

The branch main has been updated by manu:

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

commit 3c2b2a28b9c102d9aa368663ea250fd644f96b46
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-12-25 18:21:52 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2024-01-10 18:20:10 +0000

    iicbus: 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.
    While here remove the condition on SOC option, device rk_i2c is enough as all
    Rockchip SoC that we support have this controller.
    
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
    Differential Revision:  https://reviews.freebsd.org/D43184
---
 sys/arm/rockchip/files.rk32xx                          | 2 +-
 sys/conf/files.arm64                                   | 2 +-
 sys/{arm64 => dev/iicbus/controller}/rockchip/rk_i2c.c | 0
 sys/modules/rockchip/rk_i2c/Makefile                   | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx
index 0f2774fd76cc..e8f838fb186a 100644
--- a/sys/arm/rockchip/files.rk32xx
+++ b/sys/arm/rockchip/files.rk32xx
@@ -2,7 +2,7 @@ kern/kern_clocksource.c			standard
 
 arm/rockchip/rk32xx_machdep.c		standard
 arm/rockchip/rk32xx_mp.c		optional	smp
-arm64/rockchip/rk_i2c.c			standard
+dev/iicbus/controller/rockchip/rk_i2c.c	standard
 arm64/rockchip/rk_iodomain.c		standard
 arm64/rockchip/rk_gpio.c		standard
 arm64/rockchip/rk_grf.c			standard
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index e6f525e63e64..21ad400bc2a7 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -344,6 +344,7 @@ ice_ddp.fw					optional ice_ddp	\
 dev/iicbus/controller/twsi/mv_twsi.c		optional twsi fdt
 dev/iicbus/controller/twsi/a10_twsi.c		optional twsi fdt
 dev/iicbus/controller/twsi/twsi.c		optional twsi fdt
+dev/iicbus/controller/rockchip/rk_i2c.c		optional rk_i2c fdt
 
 dev/ipmi/ipmi.c					optional ipmi
 dev/ipmi/ipmi_acpi.c				optional ipmi acpi
@@ -660,7 +661,6 @@ arm64/rockchip/rk3568_combphy.c			optional fdt rk_combphy soc_rockchip_rk3568
 arm64/rockchip/rk3568_pcie.c			optional fdt pci soc_rockchip_rk3568
 arm64/rockchip/rk3568_pciephy.c			optional fdt pci soc_rockchip_rk3568
 arm64/rockchip/rk_dwc3.c			optional fdt rk_dwc3 soc_rockchip_rk3399 | fdt rk_dwc3 soc_rockchip_rk3568
-arm64/rockchip/rk_i2c.c				optional fdt rk_i2c soc_rockchip_rk3328 | fdt rk_i2c soc_rockchip_rk3399 | fdt rk_i2c soc_rockchip_rk3568
 arm64/rockchip/rk_i2s.c				optional fdt sound soc_rockchip_rk3328 | fdt sound soc_rockchip_rk3399
 arm64/rockchip/rk_otp.c				optional fdt soc_rockchip_rk3568
 arm64/rockchip/rk_otp_if.m			optional fdt soc_rockchip_rk3568
diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/dev/iicbus/controller/rockchip/rk_i2c.c
similarity index 100%
rename from sys/arm64/rockchip/rk_i2c.c
rename to sys/dev/iicbus/controller/rockchip/rk_i2c.c
diff --git a/sys/modules/rockchip/rk_i2c/Makefile b/sys/modules/rockchip/rk_i2c/Makefile
index b90b65f1410d..3cf847e1d1cc 100644
--- a/sys/modules/rockchip/rk_i2c/Makefile
+++ b/sys/modules/rockchip/rk_i2c/Makefile
@@ -1,5 +1,5 @@
 
-.PATH: ${SRCTOP}/sys/arm64/rockchip
+.PATH: ${SRCTOP}/sys/dev/iicbus/controller/rockchip
 
 KMOD=	rk_i2c
 SRCS=	rk_i2c.c