diff options
author | Tom Rini <trini@konsulko.com> | 2022-11-16 11:08:28 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-11-16 11:08:28 -0500 |
commit | d78cccb1acd683083560d71753c116c6e38e2491 (patch) | |
tree | 3329114381628882aa0777630350e234023604e4 /drivers/clk/microchip/mpfs_clk_cfg.c | |
parent | c4ee4fe92e9be120be6d12718273dec6b63cc7d9 (diff) | |
parent | 591e0f878083925e7afff82e1774ba295a7767aa (diff) |
Merge https://source.denx.de/u-boot/custodians/u-boot-riscv
- Fix and improve microchip's clock driver to allow sync'ing DTS with linux
- Improve the help message in "SBI_V02" Kconfig
- Improve DTS property "isa-string" parsing rule
Diffstat (limited to 'drivers/clk/microchip/mpfs_clk_cfg.c')
-rw-r--r-- | drivers/clk/microchip/mpfs_clk_cfg.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/clk/microchip/mpfs_clk_cfg.c b/drivers/clk/microchip/mpfs_clk_cfg.c index fefddd14137..5739fd66e8d 100644 --- a/drivers/clk/microchip/mpfs_clk_cfg.c +++ b/drivers/clk/microchip/mpfs_clk_cfg.c @@ -117,8 +117,7 @@ static struct mpfs_cfg_hw_clock mpfs_cfg_clks[] = { CLK_CFG(CLK_AHB, "clk_ahb", 4, 2, mpfs_div_ahb_table, 0), }; -int mpfs_clk_register_cfgs(void __iomem *base, u32 clk_rate, - const char *parent_name) +int mpfs_clk_register_cfgs(void __iomem *base, struct clk *parent) { int ret; int i, id, num_clks; @@ -129,9 +128,9 @@ int mpfs_clk_register_cfgs(void __iomem *base, u32 clk_rate, for (i = 0; i < num_clks; i++) { hw = &mpfs_cfg_clks[i].hw; mpfs_cfg_clks[i].sys_base = base; - mpfs_cfg_clks[i].prate = clk_rate; + mpfs_cfg_clks[i].prate = clk_get_rate(parent); name = mpfs_cfg_clks[i].cfg.name; - ret = clk_register(hw, MPFS_CFG_CLOCK, name, parent_name); + ret = clk_register(hw, MPFS_CFG_CLOCK, name, parent->dev->name); if (ret) ERR_PTR(ret); id = mpfs_cfg_clks[i].cfg.id; |