git: 51919325ffd3 - main - arm64: rockchip: Move rk805 pmic driver to dev/iicbus/pmic/rockchip

The branch main has been updated by manu:

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

commit 51919325ffd32c3881542bce54ce4482875598fd
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-11-11 17:44:03 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2021-11-14 11:31:07 +0000

    arm64: rockchip: Move rk805 pmic driver to dev/iicbus/pmic/rockchip
    
    Having all PMIC driver at the same place makes it easier.
---
 sys/conf/files.arm64                               | 2 +-
 sys/{arm64 => dev/iicbus/pmic}/rockchip/rk805.c    | 2 +-
 sys/{arm64 => dev/iicbus/pmic}/rockchip/rk805reg.h | 0
 sys/modules/rockchip/rk805/Makefile                | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index a2cf15de1ac0..1f344d0273b8 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -540,7 +540,7 @@ arm64/rockchip/rk3399_emmcphy.c			optional fdt rk_emmcphy soc_rockchip_rk3399
 arm64/rockchip/rk_dwc3.c			optional fdt rk_dwc3 soc_rockchip_rk3399
 arm64/rockchip/rk_i2c.c				optional fdt rk_i2c soc_rockchip_rk3328 | fdt rk_i2c soc_rockchip_rk3399
 arm64/rockchip/rk_i2s.c				optional fdt sound soc_rockchip_rk3328 | fdt sound soc_rockchip_rk3399
-arm64/rockchip/rk805.c				optional fdt rk805 soc_rockchip_rk3328 | fdt rk805 soc_rockchip_rk3399
+dev/iicbus/pmic/rockchip/rk805.c		optional fdt rk805 soc_rockchip_rk3328 | fdt rk805 soc_rockchip_rk3399
 arm64/rockchip/rk_grf.c				optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399
 arm64/rockchip/rk_pinctrl.c			optional fdt rk_pinctrl soc_rockchip_rk3328 | fdt rk_pinctrl soc_rockchip_rk3399
 arm64/rockchip/rk_gpio.c			optional fdt rk_gpio soc_rockchip_rk3328 | fdt rk_gpio soc_rockchip_rk3399
diff --git a/sys/arm64/rockchip/rk805.c b/sys/dev/iicbus/pmic/rockchip/rk805.c
similarity index 99%
rename from sys/arm64/rockchip/rk805.c
rename to sys/dev/iicbus/pmic/rockchip/rk805.c
index d3bda29ae362..27e9e3a5287e 100644
--- a/sys/arm64/rockchip/rk805.c
+++ b/sys/dev/iicbus/pmic/rockchip/rk805.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/extres/clk/clk.h>
 #include <dev/extres/regulator/regulator.h>
 
-#include <arm64/rockchip/rk805reg.h>
+#include <dev/iicbus/pmic/rockchip/rk805reg.h>
 
 #include "clock_if.h"
 #include "regdev_if.h"
diff --git a/sys/arm64/rockchip/rk805reg.h b/sys/dev/iicbus/pmic/rockchip/rk805reg.h
similarity index 100%
rename from sys/arm64/rockchip/rk805reg.h
rename to sys/dev/iicbus/pmic/rockchip/rk805reg.h
diff --git a/sys/modules/rockchip/rk805/Makefile b/sys/modules/rockchip/rk805/Makefile
index 395b9fc49c72..386e41c05bad 100644
--- a/sys/modules/rockchip/rk805/Makefile
+++ b/sys/modules/rockchip/rk805/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${SRCTOP}/sys/arm64/rockchip
+.PATH: ${SRCTOP}/sys/dev/iicbus/pmic/rockchip
 
 KMOD=	rk805
 SRCS=	rk805.c