Skip to contentSkip to conversation

clk: Allow kunit tests to run without OF_OVERLAY enabled

PATCH Applied Stephen Boyd 1 participant 2 messages Oct 16, 2024 – Oct 22, 2024 Common clk

lore
Share & tools
lore

Stephen Boyd

author maintainer
#0 lore raw

PATCH 1/1 clk: Allow kunit tests to run without OF_OVERLAY enabled

Some configurations want to enable CONFIG_KUNIT without enabling CONFIG_OF_OVERLAY. The kunit overlay code already skips if CONFIG_OF_OVERLAY isn't enabled, so these selects here aren't really doing anything besides making it easier to run the tests without them skipping. Remove the select and move the config setting to the drivers/clk/.kunitconfig file so that the clk tests can be run with or without CONFIG_OF_OVERLAY set to test either behavior.

Fixes 5776526beb95 ("clk: Add KUnit tests for clk fixed rate basic type")
Fixes 274aff8711b2 ("clk: Add KUnit tests for clks registered with struct clk_parent_data")
---
 drivers/clk/.kunitconfig | 1 +
 drivers/clk/Kconfig      | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/clk/.kunitconfig +1 -0
index 54ece9207055..08e26137f3d9 100644
@@ -1,5 +1,6 @@
 CONFIG_KUNIT=y
 CONFIG_OF=y
+CONFIG_OF_OVERLAY=y
 CONFIG_COMMON_CLK=y
 CONFIG_CLK_KUNIT_TEST=y
 CONFIG_CLK_FIXED_RATE_KUNIT_TEST=y
drivers/clk/Kconfig +0 -2
index 299bc678ed1b..0fe07a594b4e 100644
@@ -517,7 +517,6 @@ config CLK_KUNIT_TEST
 	tristate "Basic Clock Framework Kunit Tests" if !KUNIT_ALL_TESTS
 	depends on KUNIT
 	default KUNIT_ALL_TESTS
-	select OF_OVERLAY if OF
 	select DTC
 	help
 	  Kunit tests for the common clock framework.
@@ -526,7 +525,6 @@ config CLK_FIXED_RATE_KUNIT_TEST
 	tristate "Basic fixed rate clk type KUnit test" if !KUNIT_ALL_TESTS
 	depends on KUNIT
 	default KUNIT_ALL_TESTS
-	select OF_OVERLAY if OF
 	select DTC
 	help
 	  KUnit tests for the basic fixed rate clk type.

base-commit: 9852d85ec9d492ebef56dc5f229416c925758edc

Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
author maintainer Applied
#1 lore raw

Quoting Stephen Boyd (2024-10-16 14:27:37)

Quoted 8 lines

Some configurations want to enable CONFIG_KUNIT without enabling CONFIG_OF_OVERLAY. The kunit overlay code already skips if CONFIG_OF_OVERLAY isn't enabled, so these selects here aren't really doing anything besides making it easier to run the tests without them skipping. Remove the select and move the config setting to the drivers/clk/.kunitconfig file so that the clk tests can be run with or without CONFIG_OF_OVERLAY set to test either behavior.

Quoted 4 lines
Fixes 5776526beb95 ("clk: Add KUnit tests for clk fixed rate basic type")
Fixes 274aff8711b2 ("clk: Add KUnit tests for clks registered with struct clk_parent_data")

---

Applied to clk-next