git: 48db612d8939 - main - arm64: Add a new SOC_ROCKCHIP option

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Emmanuel Vadot <manu_at_FreeBSD.org>
Date: Mon, 06 Jan 2025 07:39:59 UTC
The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=48db612d8939fab6081fc2bf16f0d42aef3c682d

commit 48db612d8939fab6081fc2bf16f0d42aef3c682d
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2025-01-02 12:46:30 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
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