[PATCH v2 4/7] clk: move fixed clocks to clk/basic
Casey Connolly <[email protected]> Wed, 01 Apr 2026 16:34:05 +0200
| Newsgroups | io.groups.u-boot-amlogic,org.u-boot-project.lists.u-boot |
|---|---|
| Message-ID | <[email protected]> |
Linux CCF has incompatible implementations of fixed-rate/fixed-factor clocks, move the U-Boot versions of these drivers to clk/basic and only build them if CCF_FULL is not enabled. Signed-off-by: Casey Connolly <[email protected]> --- drivers/clk/Makefile | 8 ++++++-- drivers/clk/basic/Makefile | 7 +++++++ drivers/clk/{ => basic}/clk_fixed_factor.c | 0 drivers/clk/{ => basic}/clk_fixed_rate.c | 0 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 30991e9f55d7..23f381eb0d9f 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -4,16 +4,20 @@ # Wolfgang Denk, DENX Software Engineering, [email protected]. # obj-$(CONFIG_$(PHASE_)CLK) += clk-uclass.o -obj-$(CONFIG_$(PHASE_)CLK) += clk_fixed_rate.o -obj-$(CONFIG_$(PHASE_)CLK) += clk_fixed_factor.o obj-$(CONFIG_$(PHASE_)CLK_GPIO) += clk-gpio.o obj-$(CONFIG_$(PHASE_)CLK_STUB) += clk-stub.o # U-Boot/IMX "micro" CCF port obj-$(CONFIG_$(PHASE_)CLK_CCF) += uccf/ +# U-Boot basic fixed clocks, full CCF has a +# different and incompatible implementation +ifndef CONFIG_CLK_CCF_FULL +obj-y += basic/ +endif + obj-y += adi/ obj-y += airoha/ obj-y += analogbits/ obj-$(CONFIG_$(PHASE_)MACH_IMX) += imx/ diff --git a/drivers/clk/basic/Makefile b/drivers/clk/basic/Makefile new file mode 100644 index 000000000000..4cf9469d2312 --- /dev/null +++ b/drivers/clk/basic/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (c) 2026 Linaro Ltd. +# + +obj-$(CONFIG_$(PHASE_)CLK) += clk_fixed_rate.o +obj-$(CONFIG_$(PHASE_)CLK) += clk_fixed_factor.o diff --git a/drivers/clk/clk_fixed_factor.c b/drivers/clk/basic/clk_fixed_factor.c similarity index 100% rename from drivers/clk/clk_fixed_factor.c rename to drivers/clk/basic/clk_fixed_factor.c diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/basic/clk_fixed_rate.c similarity index 100% rename from drivers/clk/clk_fixed_rate.c rename to drivers/clk/basic/clk_fixed_rate.c -- 2.51.0