> On 13 Sep 2017, at 12:09, David Wu <david.wu at rock-chips.com> wrote:
>
Please add a commit message.
> Signed-off-by: David Wu <david.wu at rock-chips.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich at theobroma-systems.com>
See above and below for requested changes.
> ---
> drivers/clk/rockchip/clk_rk3288.c | 45 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 45 insertions(+)
>
> diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
> index 478195b..29652b0 100644
> --- a/drivers/clk/rockchip/clk_rk3288.c
> +++ b/drivers/clk/rockchip/clk_rk3288.c
> @@ -111,6 +111,15 @@ enum {
> PERI_ACLK_DIV_SHIFT = 0,
> PERI_ACLK_DIV_MASK = 0x1f << PERI_ACLK_DIV_SHIFT,
>
> + /*
> + * CLKSEL24
> + * saradc_div_con:
> + * clk_saradc=24MHz/(saradc_div_con+1)
> + */
> + CLK_SARADC_DIV_CON_SHIFT = 8,
> + CLK_SARADC_DIV_CON_MASK = 0xff << CLK_SARADC_DIV_CON_SHIFT,
> + CLK_SARADC_DIV_CON_WIDTH = 8,
> +
> SOCSTS_DPLL_LOCK = 1 << 5,
> SOCSTS_APLL_LOCK = 1 << 6,
> SOCSTS_CPLL_LOCK = 1 << 7,
> @@ -131,6 +140,11 @@ static const struct pll_div apll_init_cfg = PLL_DIVISORS(APLL_HZ, 1, 1);
> static const struct pll_div gpll_init_cfg = PLL_DIVISORS(GPLL_HZ, 2, 2);
> static const struct pll_div cpll_init_cfg = PLL_DIVISORS(CPLL_HZ, 1, 2);
>
> +static inline u32 extract_bits(u32 val, unsigned width, unsigned shift)
> +{
> + return (val >> shift) & ((1 << width) - 1);
> +}
Please reuse what?s already available in include/bitfield.h.
This also applies to all call-sites for extract_bits below: they should directly use the already existing function.
> +
> static int rkclk_set_pll(struct rk3288_cru *cru, enum rk_clk_id clk_id,
> const struct pll_div *div)
> {
> @@ -634,6 +648,31 @@ static ulong rockchip_spi_set_clk(struct rk3288_cru *cru, uint gclk_rate,
> return rockchip_spi_get_clk(cru, gclk_rate, periph);
> }
>
> +static ulong rockchip_saradc_get_clk(struct rk3288_cru *cru)
> +{
> + u32 div, val;
> +
> + val = readl(&cru->cru_clksel_con[24]);
> + div = extract_bits(val, CLK_SARADC_DIV_CON_WIDTH,
> + CLK_SARADC_DIV_CON_SHIFT);
> +
> + return DIV_TO_RATE(OSC_HZ, div);
> +}
> +
> +static ulong rockchip_saradc_set_clk(struct rk3288_cru *cru, uint hz)
> +{
> + int src_clk_div;
> +
> + src_clk_div = DIV_ROUND_UP(OSC_HZ, hz) - 1;
> + assert(src_clk_div < 128);
> +
> + rk_clrsetreg(&cru->cru_clksel_con[24],
> + CLK_SARADC_DIV_CON_MASK,
> + src_clk_div << CLK_SARADC_DIV_CON_SHIFT);
> +
> + return rockchip_saradc_get_clk(cru);
> +}
> +
> static ulong rk3288_clk_get_rate(struct clk *clk)
> {
> struct rk3288_clk_priv *priv = dev_get_priv(clk->dev);
> @@ -666,6 +705,9 @@ static ulong rk3288_clk_get_rate(struct clk *clk)
> return gclk_rate;
> case PCLK_PWM:
> return PD_BUS_PCLK_HZ;
> + case SCLK_SARADC:
> + new_rate = rockchip_saradc_get_clk(priv->cru);
> + break;
> default:
> return -ENOENT;
> }
> @@ -756,6 +798,9 @@ static ulong rk3288_clk_set_rate(struct clk *clk, ulong rate)
> new_rate = rate;
> break;
> #endif
> + case SCLK_SARADC:
> + new_rate = rockchip_saradc_set_clk(priv->cru, rate);
> + break;
> default:
> return -ENOENT;
> }
> --
> 2.7.4
>
>
