test: dm: clk_ccf: test ccf_clk_ops

Assign ccf_clk_ops to .ops of clk_ccf driver so that it can act as an
clk provider. Also add "#clock-cells=<1>" to its device tree node.

Add "i2c_root" to clk_test in the device tree and driver for testing.

Get "i2c_root" clock in CCF unit tests and add tests for it.

Signed-off-by: Yang Xiwen <forbidden405@outlook.com>
Reviewed-by: Sean Anderson <seanga2@gmail.com>
Link: https://lore.kernel.org/r/20231111-enable_count-v3-2-08a821892fa9@outlook.com
This commit is contained in:
Yang Xiwen 2023-12-16 02:28:52 +08:00 committed by Sean Anderson
parent 9e0250321a
commit d306182439
5 changed files with 17 additions and 4 deletions

View File

@ -631,9 +631,10 @@
clocks = <&clk_fixed>, clocks = <&clk_fixed>,
<&clk_sandbox 1>, <&clk_sandbox 1>,
<&clk_sandbox 0>, <&clk_sandbox 0>,
<&ccf 11>,
<&clk_sandbox 3>, <&clk_sandbox 3>,
<&clk_sandbox 2>; <&clk_sandbox 2>;
clock-names = "fixed", "i2c", "spi", "uart2", "uart1"; clock-names = "fixed", "i2c", "spi", "i2c_root", "uart2", "uart1";
}; };
clk-test2 { clk-test2 {
@ -654,6 +655,7 @@
ccf: clk-ccf { ccf: clk-ccf {
compatible = "sandbox,clk-ccf"; compatible = "sandbox,clk-ccf";
#clock-cells = <1>;
}; };
efi-media { efi-media {

View File

@ -39,6 +39,7 @@ enum sandbox_clk_test_id {
SANDBOX_CLK_TEST_ID_FIXED, SANDBOX_CLK_TEST_ID_FIXED,
SANDBOX_CLK_TEST_ID_SPI, SANDBOX_CLK_TEST_ID_SPI,
SANDBOX_CLK_TEST_ID_I2C, SANDBOX_CLK_TEST_ID_I2C,
SANDBOX_CLK_TEST_ID_I2C_ROOT,
SANDBOX_CLK_TEST_ID_DEVM1, SANDBOX_CLK_TEST_ID_DEVM1,
SANDBOX_CLK_TEST_ID_DEVM2, SANDBOX_CLK_TEST_ID_DEVM2,
SANDBOX_CLK_TEST_ID_DEVM_NULL, SANDBOX_CLK_TEST_ID_DEVM_NULL,

View File

@ -284,6 +284,7 @@ static int sandbox_clk_ccf_probe(struct udevice *dev)
U_BOOT_DRIVER(sandbox_clk_ccf) = { U_BOOT_DRIVER(sandbox_clk_ccf) = {
.name = "sandbox_clk_ccf", .name = "sandbox_clk_ccf",
.id = UCLASS_CLK, .id = UCLASS_CLK,
.ops = &ccf_clk_ops,
.probe = sandbox_clk_ccf_probe, .probe = sandbox_clk_ccf_probe,
.of_match = sandbox_clk_ccf_test_ids, .of_match = sandbox_clk_ccf_test_ids,
}; };

View File

@ -15,6 +15,7 @@ static const char * const sandbox_clk_test_names[] = {
[SANDBOX_CLK_TEST_ID_FIXED] = "fixed", [SANDBOX_CLK_TEST_ID_FIXED] = "fixed",
[SANDBOX_CLK_TEST_ID_SPI] = "spi", [SANDBOX_CLK_TEST_ID_SPI] = "spi",
[SANDBOX_CLK_TEST_ID_I2C] = "i2c", [SANDBOX_CLK_TEST_ID_I2C] = "i2c",
[SANDBOX_CLK_TEST_ID_I2C_ROOT] = "i2c_root",
}; };
int sandbox_clk_test_get(struct udevice *dev) int sandbox_clk_test_get(struct udevice *dev)

View File

@ -18,8 +18,8 @@
/* Tests for Common Clock Framework driver */ /* Tests for Common Clock Framework driver */
static int dm_test_clk_ccf(struct unit_test_state *uts) static int dm_test_clk_ccf(struct unit_test_state *uts)
{ {
struct clk *clk, *pclk; struct clk *clk, *pclk, clk_ccf;
struct udevice *dev; struct udevice *dev, *test_dev;
long long rate; long long rate;
int ret; int ret;
#if CONFIG_IS_ENABLED(CLK_CCF) #if CONFIG_IS_ENABLED(CLK_CCF)
@ -29,6 +29,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts)
/* Get the device using the clk device */ /* Get the device using the clk device */
ut_assertok(uclass_get_device_by_name(UCLASS_CLK, "clk-ccf", &dev)); ut_assertok(uclass_get_device_by_name(UCLASS_CLK, "clk-ccf", &dev));
ut_assertok(uclass_get_device_by_name(UCLASS_MISC, "clk-test", &test_dev));
/* Test for clk_get_by_id() */ /* Test for clk_get_by_id() */
ret = clk_get_by_id(SANDBOX_CLK_ECSPI_ROOT, &clk); ret = clk_get_by_id(SANDBOX_CLK_ECSPI_ROOT, &clk);
@ -119,11 +120,18 @@ static int dm_test_clk_ccf(struct unit_test_state *uts)
#if CONFIG_IS_ENABLED(CLK_CCF) #if CONFIG_IS_ENABLED(CLK_CCF)
/* Test clk tree enable/disable */ /* Test clk tree enable/disable */
ret = clk_get_by_index(test_dev, SANDBOX_CLK_TEST_ID_I2C_ROOT, &clk_ccf);
ut_assertok(ret);
ut_asserteq_str("clk-ccf", clk_ccf.dev->name);
ut_asserteq(clk_ccf.id, SANDBOX_CLK_I2C_ROOT);
ret = clk_get_by_id(SANDBOX_CLK_I2C_ROOT, &clk); ret = clk_get_by_id(SANDBOX_CLK_I2C_ROOT, &clk);
ut_assertok(ret); ut_assertok(ret);
ut_asserteq_str("i2c_root", clk->dev->name); ut_asserteq_str("i2c_root", clk->dev->name);
ut_asserteq(clk->id, SANDBOX_CLK_I2C_ROOT);
ret = clk_enable(clk); ret = clk_enable(&clk_ccf);
ut_assertok(ret); ut_assertok(ret);
ret = sandbox_clk_enable_count(clk); ret = sandbox_clk_enable_count(clk);