From nobody Sun Nov 14 12:34:20 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AE01A183C2A9; Sun, 14 Nov 2021 12:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HsWwX4WJZz4cJl; Sun, 14 Nov 2021 12:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6FF282688D; Sun, 14 Nov 2021 12:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AECYKku068397; Sun, 14 Nov 2021 12:34:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AECYKvV068396; Sun, 14 Nov 2021 12:34:20 GMT (envelope-from git) Date: Sun, 14 Nov 2021 12:34:20 GMT Message-Id: <202111141234.1AECYKvV068396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 51919325ffd3 - main - arm64: rockchip: Move rk805 pmic driver to dev/iicbus/pmic/rockchip List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51919325ffd32c3881542bce54ce4482875598fd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=51919325ffd32c3881542bce54ce4482875598fd commit 51919325ffd32c3881542bce54ce4482875598fd Author: Emmanuel Vadot AuthorDate: 2021-11-11 17:44:03 +0000 Commit: Emmanuel Vadot 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 #include -#include +#include #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