change the clk-mux get_rate helper
cover change the clk-mux get_rate helper
Changes:
- Apply coding style
- Fix typo
- Fix access to sandbox register
- Change the gate_rate helper
Dario Binacchi (4):
clk: ccf: mux: change include order
clk: ccf: mux: fix typo
clk: ccf: mux: fix access to the sandbox register
clk: ccf: mux: change the get_rate helper
drivers/clk/clk-mux.c | 44 +++++++++++++++++++++++++++++++++++++------ test/dm/clk_ccf.c | 24 +++++++++++++++++++++++ 2 files changed, 62 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/4 clk: ccf: mux: change include order
Apply u-boot coding style on include files order.
---
drivers/clk/clk-mux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/clk-mux.c +4 -4
@@ -22,15 +22,15 @@*/ #include <common.h> -#include <asm/io.h> -#include <malloc.h> +#include <clk.h> #include <clk-uclass.h> #include <dm/device.h> #include <dm/devres.h> +#include <malloc.h> +#include <asm/io.h> #include <linux/clk-provider.h> -#include <clk.h> -#include "clk.h" #include <linux/err.h> +#include "clk.h" #define UBOOT_DM_CLK_CCF_MUX "ccf_clk_mux"
Signature · 1 line
2.17.1
PATCH 2/4 clk: ccf: mux: fix typo
In reply to Dario BinacchiClose the opening bracket.
---
drivers/clk/clk-mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/clk-mux.c +1 -1
@@ -193,7 +193,7 @@ struct clk *clk_hw_register_mux_table(struct device *dev, const char *name,* Read the current mux setup - so we assign correct parent. * * Changing parent would require changing internals of udevice struct -* for the corresponding clock (to do that define .set_parent() method. +* for the corresponding clock (to do that define .set_parent() method). */ ret =clk_register (clk,UBOOT_DM_CLK_CCF_MUX , name, parent_names[clk_mux_get_parent (clk)]);
Signature · 1 line
2.17.1
PATCH 3/4 clk: ccf: mux: fix access to the sandbox register
In reply to Dario BinacchiThe tests developed for the mux clock are run on the sandbox. They don't call the clk_mux_set_parent routine and therefore they do not detect this error.
---
drivers/clk/clk-mux.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/clk/clk-mux.c +8 -0
@@ -134,12 +134,20 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent)if (mux->flags &CLK_MUX_HIWORD_MASK ) { reg = mux->mask << (mux->shift +16 ); }else { +#if CONFIG_IS_ENABLED (SANDBOX_CLK_CCF ) + reg = mux->io_mux_val; +#else reg =readl (mux->reg); +#endif reg &= ~(mux->mask << mux->shift); } val = val << mux->shift; reg |= val; +#if CONFIG_IS_ENABLED (SANDBOX_CLK_CCF ) + mux->io_mux_val = reg; +#else writel (reg, mux->reg); +#endif return 0 ; }
Signature · 1 line
2.17.1
PATCH 4/4 clk: ccf: mux: change the get_rate helper
In reply to Dario BinacchiThe previous version of the get_rate helper does not work if the mux clock parent is changed after the probe. This error has not been detected because this condition has not been tested. The error occurs because the set_parent helper does not change the parent of the clock device but only the clock selection register. Since changing the parent of a probed device can be tricky, the new version of the get_rate helper provides the rate of the selected clock and not that of the parent.
---
drivers/clk/clk-mux.c | 26 +++++++++++++++++++++++++- test/dm/clk_ccf.c | 24 ++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-)
drivers/clk/clk-mux.c +25 -1
@@ -152,8 +152,32 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent)return 0 ; } +static ulong clk_mux_get_rate (struct clk *clk) +{ +struct clk_mux *mux =to_clk_mux (clk_dev_binded (clk) ? +dev_get_clk_ptr (clk->dev) : clk); +struct udevice *parent; +struct clk *pclk; +int err, index; + + index =clk_mux_get_parent (clk); +if (index >= mux->num_parents) +return -EFAULT ; + + err =uclass_get_device_by_name (UCLASS_CLK , mux->parent_names[index], + &parent); +if (err) +return err; + + pclk =dev_get_clk_ptr (parent); +if (!pclk) +return -ENODEV ; + +return clk_get_rate (pclk); +} +const struct clk_ops clk_mux_ops = { - .get_rate = clk_generic_get_rate, + .get_rate = clk_mux_get_rate, .set_parent = clk_mux_set_parent, };
test/dm/clk_ccf.c +24 -0
@@ -46,6 +46,18 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) rate =clk_get_parent_rate (clk);ut_asserteq (rate,60000000 ); + rate =clk_get_rate (clk); +ut_asserteq (rate,60000000 ); + + ret =clk_get_by_id (SANDBOX_CLK_PLL3_80M , &pclk); +ut_assertok (ret); + + ret =clk_set_parent (clk, pclk); +ut_assertok (ret); + + rate =clk_get_rate (clk); +ut_asserteq (rate,80000000 ); + ret =clk_get_by_id (SANDBOX_CLK_USDHC2_SEL , &clk);ut_assertok (ret);ut_asserteq_str ("usdhc2_sel" , clk->dev->name);
@@ -56,6 +68,18 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) pclk =clk_get_parent (clk);ut_asserteq_str ("pll3_80m" , pclk->dev->name); + rate =clk_get_rate (clk); +ut_asserteq (rate,80000000 ); + + ret =clk_get_by_id (SANDBOX_CLK_PLL3_60M , &pclk); +ut_assertok (ret); + + ret =clk_set_parent (clk, pclk); +ut_assertok (ret); + + rate =clk_get_rate (clk); +ut_asserteq (rate,60000000 ); +/* Test the composite of CCF */ ret =clk_get_by_id (SANDBOX_CLK_I2C , &clk);ut_assertok (ret);
Signature · 1 line
2.17.1
PATCH 4/4 clk: ccf: mux: change the get_rate helper
+Stephen Warren
Quoted 9 lines · Dario Binacchi
The previous version of the
get_ratehelper does not work if the mux clock parent is changed after the probe. This error has not been detected because this condition has not been tested. The error occurs because theset_parenthelper does not change the parent of the clock device but only the clock selection register. Since changing the parent of a probed device can be tricky, the new version of theget_ratehelper provides the rate of the selected clock and not that of the parent.
Quoted 7 lines
Signed-off-by Dario Binacchi <[email protected]>---
drivers/clk/clk-mux.c | 26 +++++++++++++++++++++++++- test/dm/clk_ccf.c | 24 ++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-)