Skip to content

Commit 5c53493

Browse files
committed
Merge tag 'socfpga_clk_for_v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into clk-socfpga
Pull SoCFPGA clk driver updates from Dinh Nguyen: - Add the Agilex5 clock driver * tag 'socfpga_clk_for_v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: clk: socfpga: agilex5: add clock driver for Agilex5
2 parents 3a86608 + 2050b57 commit 5c53493

7 files changed

Lines changed: 736 additions & 2 deletions

File tree

drivers/clk/socfpga/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ config CLK_INTEL_SOCFPGA32
1313
default ARM && ARCH_INTEL_SOCFPGA
1414

1515
config CLK_INTEL_SOCFPGA64
16-
bool "Intel Stratix / Agilex / N5X clock controller support" if COMPILE_TEST && (!ARM64 || !ARCH_INTEL_SOCFPGA)
16+
bool "Intel Stratix / Agilex / N5X / Agilex5 clock controller support" if COMPILE_TEST && (!ARM64 || !ARCH_INTEL_SOCFPGA)
1717
default ARM64 && ARCH_INTEL_SOCFPGA
1818

1919
endif # CLK_INTEL_SOCFPGA

drivers/clk/socfpga/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ obj-$(CONFIG_CLK_INTEL_SOCFPGA32) += clk.o clk-gate.o clk-pll.o clk-periph.o \
33
clk-pll-a10.o clk-periph-a10.o clk-gate-a10.o
44
obj-$(CONFIG_CLK_INTEL_SOCFPGA64) += clk-s10.o \
55
clk-pll-s10.o clk-periph-s10.o clk-gate-s10.o \
6-
clk-agilex.o
6+
clk-agilex.o clk-agilex5.o

0 commit comments

Comments
 (0)