Set clock flags in the ccf registration routines
cover Set clock flags in the ccf registration routines
Test for ccf gated clock has been added too.
Dario Binacchi (2):
dm: test: clk: add the test for the ccf gated clock
clk: set flags in the ccf registration routines
drivers/clk/clk-composite.c | 1 + drivers/clk/clk-divider.c | 1 + drivers/clk/clk-fixed-factor.c | 1 + drivers/clk/clk-gate.c | 1 + drivers/clk/clk-mux.c | 1 + drivers/clk/clk_sandbox_ccf.c | 7 ++++++- include/sandbox-clk.h | 8 ++++++++ test/dm/clk_ccf.c | 15 +++++++++++++++ 8 files changed, 34 insertions(+), 1 deletion(-)
Signature · 1 line
2.17.1
PATCH 1/2 dm: test: clk: add the test for the ccf gated clock
Unlike the other clock types, in the case of the gated clock, a new driver has been developed which does not use the registering routine provided by the common clock framework.
The addition of the ecspi0 clock to sandbox therefore allows testing the ccf gate clock.
---
drivers/clk/clk_sandbox_ccf.c | 4 ++++ include/sandbox-clk.h | 8 ++++++++ test/dm/clk_ccf.c | 8 ++++++++ 3 files changed, 20 insertions(+)
drivers/clk/clk_sandbox_ccf.c +4 -0
@@ -249,6 +249,10 @@ static int sandbox_clk_ccf_probe(struct udevice *dev)clk_dm (SANDBOX_CLK_ECSPI_ROOT ,sandbox_clk_divider ("ecspi_root" ,"pll3_60m" , ®,19 ,6 )); + reg =0 ; +clk_dm (SANDBOX_CLK_ECSPI0 , +sandbox_clk_gate ("ecspi0" ,"ecspi_root" , ®,0 ,0 )); +clk_dm (SANDBOX_CLK_ECSPI1 ,sandbox_clk_gate2 ("ecspi1" ,"ecspi_root" , base +0x6c ,0 ));
include/sandbox-clk.h +8 -0
@@ -50,6 +50,14 @@ static inline struct clk *sandbox_clk_divider(const char *name, reg, shift, width, 0); } +static inline struct clk *sandbox_clk_gate (const char *name,const char *parent, +void __iomem *reg,u8 bit_idx, +u8 clk_gate_flags) +{ +return clk_register_gate (NULL , name, parent,CLK_SET_RATE_PARENT , + reg, bit_idx, clk_gate_flags,NULL ); +} + struct clk *sandbox_clk_register_gate2(struct device *dev, const char *name, const char *parent_name, unsigned long flags,
test/dm/clk_ccf.c +8 -0
@@ -38,6 +38,14 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) rate =clk_get_parent_rate (clk);ut_asserteq (rate,20000000 ); +/* test the gate of CCF */ + ret =clk_get_by_id (SANDBOX_CLK_ECSPI0 , &clk); +ut_assertok (ret); +ut_asserteq_str ("ecspi0" , clk->dev->name); + + rate =clk_get_parent_rate (clk); +ut_asserteq (rate,20000000 ); +/* Test the mux of CCF */ ret =clk_get_by_id (SANDBOX_CLK_USDHC1_SEL , &clk);ut_assertok (ret);
Signature · 1 line
2.17.1
PATCH 1/2 dm: test: clk: add the test for the ccf gated clock
Quoted 7 lines · Dario Binacchi
Unlike the other clock types, in the case of the gated clock, a new driver has been developed which does not use the registering routine provided by the common clock framework.
The addition of the ecspi0 clock to sandbox therefore allows testing the ccf gate clock.
Quoted 7 lines
Signed-off-by Dario Binacchi <[email protected]>---
drivers/clk/clk_sandbox_ccf.c | 4 ++++ include/sandbox-clk.h | 8 ++++++++ test/dm/clk_ccf.c | 8 ++++++++ 3 files changed, 20 insertions(+)
PATCH 2/2 clk: set flags in the ccf registration routines
In reply to Dario BinacchiThe top-level framework flags are passed as parameter to the common clock framework (ccf) registration routines without being used. Checks of the flags setting added by the patch have been added in the ccf test.
---
drivers/clk/clk-composite.c | 1 + drivers/clk/clk-divider.c | 1 + drivers/clk/clk-fixed-factor.c | 1 + drivers/clk/clk-gate.c | 1 + drivers/clk/clk-mux.c | 1 + drivers/clk/clk_sandbox_ccf.c | 3 ++- test/dm/clk_ccf.c | 7 +++++++ 7 files changed, 14 insertions(+), 1 deletion(-)
drivers/clk/clk-composite.c +1 -0
@@ -140,6 +140,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name, } clk = &composite->clk; + clk->flags = flags; ret =clk_register (clk,UBOOT_DM_CLK_COMPOSITE , name, parent_names[clk_composite_get_parent (clk)]);if (ret) {
drivers/clk/clk-divider.c +1 -0
@@ -213,6 +213,7 @@ static struct clk *_register_divider(struct device *dev, const char *name,/* register the clock */ clk = &div->clk; + clk->flags = flags; ret =clk_register (clk,UBOOT_DM_CLK_CCF_DIVIDER , name, parent_name);if (ret) {
drivers/clk/clk-fixed-factor.c +1 -0
@@ -50,6 +50,7 @@ struct clk *clk_hw_register_fixed_factor(struct device *dev, fix->mult = mult; fix->div = div; clk = &fix->clk; + clk->flags = flags; ret =clk_register (clk,UBOOT_DM_CLK_IMX_FIXED_FACTOR , name, parent_name);
drivers/clk/clk-gate.c +1 -0
@@ -143,6 +143,7 @@ struct clk *clk_register_gate(struct device *dev, const char *name,#endif clk = &gate->clk; + clk->flags = flags; ret =clk_register (clk,UBOOT_DM_CLK_GATE , name, parent_name);if (ret) {
drivers/clk/clk-mux.c +1 -0
@@ -188,6 +188,7 @@ struct clk *clk_hw_register_mux_table(struct device *dev, const char *name,#endif clk = &mux->clk; + clk->flags = flags;/* * Read the current mux setup - so we assign correct parent.
drivers/clk/clk_sandbox_ccf.c +2 -1
@@ -129,6 +129,7 @@ struct clk *sandbox_clk_register_gate2(struct device *dev, const char *name, gate->state =0 ; clk = &gate->clk; + clk->flags = flags; ret =clk_register (clk,"sandbox_clk_gate2" , name, parent_name);if (ret) {
@@ -271,7 +272,7 @@ static int sandbox_clk_ccf_probe(struct udevice *dev) reg =BIT (28 ) |BIT (24 ) |BIT (16 );clk_dm (SANDBOX_CLK_I2C ,sandbox_clk_composite ("i2c" , i2c_sels,ARRAY_SIZE (i2c_sels), - ®,0 )); + ®,CLK_SET_RATE_UNGATE ));clk_dm (SANDBOX_CLK_I2C_ROOT ,sandbox_clk_gate2 ("i2c_root" ,"i2c" , base +0x7c ,0 ));
test/dm/clk_ccf.c +7 -0
@@ -29,11 +29,13 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret =clk_get_by_id (SANDBOX_CLK_ECSPI_ROOT , &clk);ut_assertok (ret);ut_asserteq_str ("ecspi_root" , clk->dev->name); +ut_asserteq (CLK_SET_RATE_PARENT , clk->flags);/* Test for clk_get_parent_rate() */ ret =clk_get_by_id (SANDBOX_CLK_ECSPI1 , &clk);ut_assertok (ret);ut_asserteq_str ("ecspi1" , clk->dev->name); +ut_asserteq (CLK_SET_RATE_PARENT , clk->flags); rate =clk_get_parent_rate (clk);ut_asserteq (rate,20000000 );
@@ -42,6 +44,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret =clk_get_by_id (SANDBOX_CLK_ECSPI0 , &clk);ut_assertok (ret);ut_asserteq_str ("ecspi0" , clk->dev->name); +ut_asserteq (CLK_SET_RATE_PARENT , clk->flags); rate =clk_get_parent_rate (clk);ut_asserteq (rate,20000000 );
@@ -50,6 +53,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret =clk_get_by_id (SANDBOX_CLK_USDHC1_SEL , &clk);ut_assertok (ret);ut_asserteq_str ("usdhc1_sel" , clk->dev->name); +ut_asserteq (CLK_SET_RATE_NO_REPARENT , clk->flags); rate =clk_get_parent_rate (clk);ut_asserteq (rate,60000000 );
@@ -57,17 +61,20 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret =clk_get_by_id (SANDBOX_CLK_USDHC2_SEL , &clk);ut_assertok (ret);ut_asserteq_str ("usdhc2_sel" , clk->dev->name); +ut_asserteq (CLK_SET_RATE_NO_REPARENT , clk->flags); rate =clk_get_parent_rate (clk);ut_asserteq (rate,80000000 ); pclk =clk_get_parent (clk);ut_asserteq_str ("pll3_80m" , pclk->dev->name); +ut_asserteq (CLK_SET_RATE_PARENT , pclk->flags);/* Test the composite of CCF */ ret =clk_get_by_id (SANDBOX_CLK_I2C , &clk);ut_assertok (ret);ut_asserteq_str ("i2c" , clk->dev->name); +ut_asserteq (CLK_SET_RATE_UNGATE , clk->flags); rate =clk_get_rate (clk);ut_asserteq (rate,60000000 );
Signature · 1 line
2.17.1
PATCH 2/2 clk: set flags in the ccf registration routines
Quoted 6 lines · Dario Binacchi
The top-level framework flags are passed as parameter to the common clock framework (ccf) registration routines without being used. Checks of the flags setting added by the patch have been added in the ccf test.
Signed-off-by Dario Binacchi <[email protected]>
Are you planning on making behaviour depend on the flags? As far as I can tell, none of them are actually used in the CCF. It seems like they were carried over from Linux.
--Sean
PATCH 2/2 clk: set flags in the ccf registration routines
Quoted 5 lines
Il 13 aprile 2020 alle 15.02 Sean Anderson <[email protected]> ha scritto:
On 4/13/20 8:36 AM, Dario Binacchi wrote:
Quoted 8 lines
Quoted 6 lines
The top-level framework flags are passed as parameter to the common clock framework (ccf) registration routines without being used. Checks of the flags setting added by the patch have been added in the ccf test.
Signed-off-by Dario Binacchi <[email protected]>Are you planning on making behaviour depend on the flags?
No, I am not planning developments depending on flags.
Except that during the implementation of a driver for an omap clock divider I had the opportunity to take a look at the code of the ccf clock-divider driver, and more generally to the ccf drivers. I was amazed that in the registration routines the flags parameter was not assigned to the clk structure flags field.
Thanks and regards
Dario Binacchi
Quoted 5 lines
As far as I
can tell, none of them are actually used in the CCF. It seems like they were carried over from Linux.--Sean