mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-27 19:09:50 -04:00
3ff3360440
The divider_round_rate() function is now deprecated, so let's migrate
to divider_determine_rate() instead so that this deprecated API can be
removed. Additionally, owl_divider_helper_round_rate() is no longer used,
so let's drop that from the header file as well.
Note that when the main function itself was migrated to use
determine_rate, this was mistakenly converted to:
req->rate = divider_round_rate(...)
This is invalid in the case when an error occurs since it can set the
rate to a negative value.
Fixes: 1b04e12a8b ("clk: actions: owl-divider: convert from round_rate() to determine_rate()")
Acked-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Brian Masney <bmasney@redhat.com>
85 lines
2.2 KiB
C
85 lines
2.2 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
//
|
|
// OWL divider clock driver
|
|
//
|
|
// Copyright (c) 2014 Actions Semi Inc.
|
|
// Author: David Liu <liuwei@actions-semi.com>
|
|
//
|
|
// Copyright (c) 2018 Linaro Ltd.
|
|
// Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
|
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/regmap.h>
|
|
|
|
#include "owl-divider.h"
|
|
|
|
static int owl_divider_determine_rate(struct clk_hw *hw,
|
|
struct clk_rate_request *req)
|
|
{
|
|
struct owl_divider *div = hw_to_owl_divider(hw);
|
|
|
|
return divider_determine_rate(hw, req, div->div_hw.table,
|
|
div->div_hw.width, div->div_hw.div_flags);
|
|
}
|
|
|
|
unsigned long owl_divider_helper_recalc_rate(struct owl_clk_common *common,
|
|
const struct owl_divider_hw *div_hw,
|
|
unsigned long parent_rate)
|
|
{
|
|
unsigned long val;
|
|
unsigned int reg;
|
|
|
|
regmap_read(common->regmap, div_hw->reg, ®);
|
|
val = reg >> div_hw->shift;
|
|
val &= (1 << div_hw->width) - 1;
|
|
|
|
return divider_recalc_rate(&common->hw, parent_rate,
|
|
val, div_hw->table,
|
|
div_hw->div_flags,
|
|
div_hw->width);
|
|
}
|
|
|
|
static unsigned long owl_divider_recalc_rate(struct clk_hw *hw,
|
|
unsigned long parent_rate)
|
|
{
|
|
struct owl_divider *div = hw_to_owl_divider(hw);
|
|
|
|
return owl_divider_helper_recalc_rate(&div->common,
|
|
&div->div_hw, parent_rate);
|
|
}
|
|
|
|
int owl_divider_helper_set_rate(const struct owl_clk_common *common,
|
|
const struct owl_divider_hw *div_hw,
|
|
unsigned long rate,
|
|
unsigned long parent_rate)
|
|
{
|
|
unsigned long val;
|
|
unsigned int reg;
|
|
|
|
val = divider_get_val(rate, parent_rate, div_hw->table,
|
|
div_hw->width, 0);
|
|
|
|
regmap_read(common->regmap, div_hw->reg, ®);
|
|
reg &= ~GENMASK(div_hw->width + div_hw->shift - 1, div_hw->shift);
|
|
|
|
regmap_write(common->regmap, div_hw->reg,
|
|
reg | (val << div_hw->shift));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int owl_divider_set_rate(struct clk_hw *hw, unsigned long rate,
|
|
unsigned long parent_rate)
|
|
{
|
|
struct owl_divider *div = hw_to_owl_divider(hw);
|
|
|
|
return owl_divider_helper_set_rate(&div->common, &div->div_hw,
|
|
rate, parent_rate);
|
|
}
|
|
|
|
const struct clk_ops owl_divider_ops = {
|
|
.recalc_rate = owl_divider_recalc_rate,
|
|
.determine_rate = owl_divider_determine_rate,
|
|
.set_rate = owl_divider_set_rate,
|
|
};
|