Skip to content

Commit

Permalink
clk: Allow kunit tests to run without OF_OVERLAY enabled
Browse files Browse the repository at this point in the history
[ Upstream commit 94e6fdd028a12ff2abe7d915f8b6bbdb923cc04d ]

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: 5776526 ("clk: Add KUnit tests for clk fixed rate basic type")
Fixes: 274aff8 ("clk: Add KUnit tests for clks registered with struct clk_parent_data")
Signed-off-by: Stephen Boyd <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
bebarino authored and gregkh committed Dec 5, 2024
1 parent 8ac19ec commit 24d7b07
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 1 addition & 0 deletions drivers/clk/.kunitconfig
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions drivers/clk/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down

0 comments on commit 24d7b07

Please sign in to comment.