From nobody Mon Jan 06 07:39:59 2025 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 4YRR0b66DLz5k6KV; Mon, 06 Jan 2025 07:39:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YRR0b5WLNz44x8; Mon, 6 Jan 2025 07:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736149199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k0nZQ6/DKHgCOxYCGj+6JHCHtqiavd1ac9BQPaEY1e4=; b=QyhhsgQXFZwnCX4AM6W/zAcmpzJyxO8Q5cYIanFDe8uAkzQaDJp1iQFsDE7KXYrqby15D3 CJzG+RaYCw7PKa/jnQWjcUHQYd/IQrf2Yx53RjH5g2yvRdHY8LaoQzVaAdMWbO9czbZYd5 FVEMtDtWqdV2d8eHAats8VTjuJws67xFjI0MNZX+98rVXdBiKAhQdmKj1VaE+dKA+CW1Mf 5ltlnsFhuKED2R4d1rkrBLPu3O49+5QXTKz42577jFwnwtpfp598VOpMZ2QYGcfCRGyKXD Uc2wknZtSWkWrVrDypb2bszycNMuTAX9fPpyN5MMcPJZFVQmJlb7/YuGnXQNlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736149199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k0nZQ6/DKHgCOxYCGj+6JHCHtqiavd1ac9BQPaEY1e4=; b=aVmbfhG5+jLsOuVjPnOArm4Y//QRSw/9rJ7hBvqqmIU7Lk2j/b5JnHouJgELXAGV8P5Rpy rmjsrJ311ST3pU857ZpsmM7MJCnHHAXIcmhXe2WHA8Zbv4jTWglHBsRLLOHTSNrxTIv8KJ aawSueAilSmomcMWipWw1ocyPCXzBwZtd8GYvz+lYTbwWzTdYRvly08Z4274CKkeYgVzzB yi44awPZJqya51gVz0OqLxY1OlqEp6kwbiDfMfAgBRY6MDMMreUvvmGphDzA5l1KfDvaWA rERrZTS2tnJCU47v4BLWWjU5+h0fYNtQWmB0cqQYPi4//b8FmRxg290JlXKgfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736149199; a=rsa-sha256; cv=none; b=ibfh+FxkSl8NgkBLeYuJIWaSWFDY7Y7ut0O0toJxsSG/vSXyN/Gel8VZU7blCOhjBoJ0+8 djhtyIxHX+ITIvwYg6ppWvoAM2fC3AgCVnmoE65BU2WEwkvRBJMuYUMnzAO4qJIcv4qRRA rg0vrIGS4Y0KG/H4X6W0fW1XcfRnedrZr3Ms6QC/QAwPnJSiUw0oW4Ip2kAG3ueVKDhmqT bQzCxC9hfB7cOWOicDahiDtU6btZzI07xiFG7hMd8wW1Ota8LyPuVQ0RR9KzUpNKldengw OElg4/FyfZhiAVMKAqODox2Rf1Iqf3gXYfWFBITNjcZgrnnh1lgz8ImpKx9JJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YRR0b4mqHz1CTF; Mon, 06 Jan 2025 07:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5067dxkt029407; Mon, 6 Jan 2025 07:39:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5067dx3R029404; Mon, 6 Jan 2025 07:39:59 GMT (envelope-from git) Date: Mon, 6 Jan 2025 07:39:59 GMT Message-Id: <202501060739.5067dx3R029404@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: 48db612d8939 - main - arm64: Add a new SOC_ROCKCHIP option 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 48db612d8939fab6081fc2bf16f0d42aef3c682d Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=48db612d8939fab6081fc2bf16f0d42aef3c682d commit 48db612d8939fab6081fc2bf16f0d42aef3c682d Author: Emmanuel Vadot AuthorDate: 2025-01-02 12:46:30 +0000 Commit: Emmanuel Vadot CommitDate: 2025-01-06 07:36:58 +0000 arm64: Add a new SOC_ROCKCHIP option A lot of drivers are shared between all rockchip SoCs, each time we add suppot for a new SoC we need to add the options in the files.arm64 lines. Add a new option SOC_ROCKCHIP that will help simplify this file. Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D48286 --- sys/arm64/conf/std.rockchip | 1 + sys/conf/files.arm64 | 30 +++++++++++++++--------------- sys/conf/options.arm64 | 7 ++++--- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/sys/arm64/conf/std.rockchip b/sys/arm64/conf/std.rockchip index 3733ddc4eeae..d32de4e4fe79 100644 --- a/sys/arm64/conf/std.rockchip +++ b/sys/arm64/conf/std.rockchip @@ -3,6 +3,7 @@ # # SoC support +options SOC_ROCKCHIP options SOC_ROCKCHIP_RK3328 options SOC_ROCKCHIP_RK3399 options SOC_ROCKCHIP_RK3568 diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 3335dfe6cab1..b1f3aefadbe1 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -720,18 +720,18 @@ arm64/rockchip/rk3568_pciephy.c optional fdt pci 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 -dev/iicbus/pmic/rockchip/rk8xx.c optional fdt rk805 soc_rockchip_rk3328 | fdt rk805 soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 -dev/iicbus/pmic/rockchip/rk8xx_clocks.c optional fdt rk805 soc_rockchip_rk3328 | fdt rk805 soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 -dev/iicbus/pmic/rockchip/rk8xx_regulators.c optional fdt rk805 soc_rockchip_rk3328 | fdt rk805 soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 -dev/iicbus/pmic/rockchip/rk8xx_rtc.c optional fdt rk805 soc_rockchip_rk3328 | fdt rk805 soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 +dev/iicbus/pmic/rockchip/rk8xx.c optional fdt rk805 soc_rockchip +dev/iicbus/pmic/rockchip/rk8xx_clocks.c optional fdt rk805 soc_rockchip +dev/iicbus/pmic/rockchip/rk8xx_regulators.c optional fdt rk805 soc_rockchip +dev/iicbus/pmic/rockchip/rk8xx_rtc.c optional fdt rk805 soc_rockchip dev/iicbus/pmic/rockchip/rk805.c optional fdt rk805 soc_rockchip_rk3328 dev/iicbus/pmic/rockchip/rk808.c optional fdt rk805 soc_rockchip_rk3399 dev/iicbus/pmic/rockchip/rk817.c optional fdt rk817 soc_rockchip_rk3568 -arm64/rockchip/rk_grf.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 -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_grf.c optional fdt soc_rockchip +arm64/rockchip/rk_pinctrl.c optional fdt rk_pinctrl soc_rockchip +arm64/rockchip/rk_gpio.c optional fdt rk_gpio soc_rockchip arm64/rockchip/rk_iodomain.c optional fdt rk_iodomain -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_usb2phy.c optional fdt rk_usb2phy soc_rockchip 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 arm64/rockchip/rk_tsadc.c optional fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 @@ -739,13 +739,13 @@ arm64/rockchip/rk_pcie.c optional fdt pci soc_rockchip_rk3399 arm64/rockchip/rk_pcie_phy.c optional fdt pci soc_rockchip_rk3399 # RockChip Clock support -dev/clk/rockchip/rk_cru.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 -dev/clk/rockchip/rk_clk_armclk.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 -dev/clk/rockchip/rk_clk_composite.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 -dev/clk/rockchip/rk_clk_fract.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 -dev/clk/rockchip/rk_clk_gate.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 -dev/clk/rockchip/rk_clk_mux.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 -dev/clk/rockchip/rk_clk_pll.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568 +dev/clk/rockchip/rk_cru.c optional fdt soc_rockchip +dev/clk/rockchip/rk_clk_armclk.c optional fdt soc_rockchip +dev/clk/rockchip/rk_clk_composite.c optional fdt soc_rockchip +dev/clk/rockchip/rk_clk_fract.c optional fdt soc_rockchip +dev/clk/rockchip/rk_clk_gate.c optional fdt soc_rockchip +dev/clk/rockchip/rk_clk_mux.c optional fdt soc_rockchip +dev/clk/rockchip/rk_clk_pll.c optional fdt soc_rockchip dev/clk/rockchip/rk3328_cru.c optional fdt soc_rockchip_rk3328 dev/clk/rockchip/rk3399_cru.c optional fdt soc_rockchip_rk3399 dev/clk/rockchip/rk3399_pmucru.c optional fdt soc_rockchip_rk3399 diff --git a/sys/conf/options.arm64 b/sys/conf/options.arm64 index e36f856ecb04..4bdd408f4651 100644 --- a/sys/conf/options.arm64 +++ b/sys/conf/options.arm64 @@ -37,7 +37,8 @@ SOC_INTEL_STRATIX10 opt_soc.h SOC_MARVELL_8K opt_soc.h SOC_NVIDIA_TEGRA210 opt_soc.h SOC_NXP_LS opt_soc.h -SOC_ROCKCHIP_RK3328 opt_soc.h -SOC_ROCKCHIP_RK3399 opt_soc.h -SOC_ROCKCHIP_RK3568 opt_soc.h +SOC_ROCKCHIP opt_soc.h +SOC_ROCKCHIP_RK3328 opt_soc.h # Depends on SOC_ROCKCHIP +SOC_ROCKCHIP_RK3399 opt_soc.h # Depends on SOC_ROCKCHIP +SOC_ROCKCHIP_RK3568 opt_soc.h # Depends on SOC_ROCKCHIP SOC_XILINX_ZYNQ opt_soc.h