From: Jean-Francois Moine <moinejf@free.fr>
To: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Mike Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>, Chen-Yu Tsai <wens@csie.org>,
linux-clk@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>,
Andre Przywara <andre.przywara@arm.com>,
Rob Herring <robh+dt@kernel.org>,
Vishnu Patekar <vishnupatekar0510@gmail.com>,
linux-arm-kernel@lists.infradead.org,
Boris Brezillon <boris.brezillon@free-electrons.com>,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Subject: Re: [PATCH v2 11/15] clk: sunxi-ng: Add N-M-factor clock support
Date: Thu, 9 Jun 2016 09:41:01 +0200 [thread overview]
Message-ID: <20160609094101.426a13c4c61aa6cb11df16fc@free.fr> (raw)
In-Reply-To: <20160607204154.31967-12-maxime.ripard@free-electrons.com>
On Tue, 7 Jun 2016 22:41:50 +0200
Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> Introduce support for clocks that multiply and divide using linear factors.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
>
> ---
> Changes from v1:
> - Fixed the maximums for both factors passed to the rational factor
> computation.
> ---
> drivers/clk/sunxi-ng/Makefile | 1 +
> drivers/clk/sunxi-ng/ccu_nm.c | 114 ++++++++++++++++++++++++++++++++++++++++++
> drivers/clk/sunxi-ng/ccu_nm.h | 95 +++++++++++++++++++++++++++++++++++
> 3 files changed, 210 insertions(+)
> create mode 100644 drivers/clk/sunxi-ng/ccu_nm.c
> create mode 100644 drivers/clk/sunxi-ng/ccu_nm.h
>
> diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile
> index a201fad6b11d..5c7ae1ad1082 100644
> --- a/drivers/clk/sunxi-ng/Makefile
> +++ b/drivers/clk/sunxi-ng/Makefile
> @@ -9,4 +9,5 @@ obj-y += ccu_gate.o
> obj-y += ccu_mp.o
> obj-y += ccu_mux.o
> obj-y += ccu_nk.o
> +obj-y += ccu_nm.o
> obj-y += ccu_phase.o
> diff --git a/drivers/clk/sunxi-ng/ccu_nm.c b/drivers/clk/sunxi-ng/ccu_nm.c
> new file mode 100644
> index 000000000000..e35ddd8eec8b
> --- /dev/null
> +++ b/drivers/clk/sunxi-ng/ccu_nm.c
> @@ -0,0 +1,114 @@
> +/*
> + * Copyright (C) 2016 Maxime Ripard
> + * Maxime Ripard <maxime.ripard@free-electrons.com>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + */
> +
> +#include <linux/clk-provider.h>
> +#include <linux/rational.h>
> +
> +#include "ccu_frac.h"
> +#include "ccu_gate.h"
> +#include "ccu_nm.h"
[snip]
> +static unsigned long ccu_nm_recalc_rate(struct clk_hw *hw,
> + unsigned long parent_rate)
> +{
> + struct ccu_nm *nm = hw_to_ccu_nm(hw);
> + unsigned long n, m;
> + u32 reg;
> +
> + if (ccu_frac_helper_is_enabled(&nm->common, &nm->frac))
> + return ccu_frac_helper_read_rate(&nm->common, &nm->frac);
> +
> + reg = readl(nm->common.base + nm->common.reg);
> +
> + n = reg >> nm->n.shift;
> + n &= (1 << nm->n.width) - 1;
> +
> + m = reg >> nm->m.shift;
> + m &= (1 << nm->m.width) - 1;
> +
> + return parent_rate * (n + 1) / (m + 1);
In the H3, 'm' is a pre-divider (audio and video PLLs):
return parent_rate / (m + 1) * (n + 1);
> +}
> +
> +static long ccu_nm_round_rate(struct clk_hw *hw, unsigned long rate,
> + unsigned long *parent_rate)
> +{
> + struct ccu_nm *nm = hw_to_ccu_nm(hw);
> + unsigned long n, m;
> +
> + rational_best_approximation(rate, *parent_rate,
> + 1 << nm->n.width, 1 << nm->m.width,
> + &n, &m);
> +
> + return *parent_rate * n / m;
Same here.
> +}
> +
> +static int ccu_nm_set_rate(struct clk_hw *hw, unsigned long rate,
> + unsigned long parent_rate)
> +{
[snip]
--
Ken ar c'hentañ | ** Breizh ha Linux atav! **
Jef | http://moinejf.free.fr/
next prev parent reply other threads:[~2016-06-09 7:41 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 20:41 [PATCH v2 00/15] clk: sunxi: introduce "modern" " Maxime Ripard
2016-06-07 20:41 ` [PATCH v2 01/15] dt-bindings: sunxi: Add CCU binding documentation Maxime Ripard
2016-06-08 1:37 ` Chen-Yu Tsai
2016-06-07 20:41 ` [PATCH v2 02/15] clk: sunxi-ng: Add common infrastructure Maxime Ripard
2016-06-09 7:39 ` Jean-Francois Moine
2016-06-07 20:41 ` [PATCH v2 03/15] clk: sunxi-ng: Add fractional lib Maxime Ripard
2016-06-07 20:41 ` [PATCH v2 04/15] clk: sunxi-ng: Add fixed factor clock support Maxime Ripard
2016-06-21 1:15 ` Stephen Boyd
2016-06-21 9:24 ` Maxime Ripard
2016-06-07 20:41 ` [PATCH v2 05/15] clk: sunxi-ng: Add gate " Maxime Ripard
2016-06-09 7:39 ` Jean-Francois Moine
2016-06-07 20:41 ` [PATCH v2 06/15] clk: sunxi-ng: Add mux " Maxime Ripard
2016-06-07 20:41 ` [PATCH v2 07/15] clk: sunxi-ng: Add phase " Maxime Ripard
2016-06-07 20:41 ` [PATCH v2 08/15] clk: sunxi-ng: Add divider Maxime Ripard
2016-06-09 7:40 ` Jean-Francois Moine
2016-06-11 8:27 ` Jean-Francois Moine
2016-06-07 20:41 ` [PATCH v2 09/15] clk: sunxi-ng: Add M-P factor clock support Maxime Ripard
2016-06-07 20:41 ` [PATCH v2 10/15] clk: sunxi-ng: Add N-K-factor " Maxime Ripard
2016-06-07 20:41 ` [PATCH v2 11/15] clk: sunxi-ng: Add N-M-factor " Maxime Ripard
2016-06-09 7:41 ` Jean-Francois Moine [this message]
2016-06-27 20:29 ` Maxime Ripard
2016-06-07 20:41 ` [PATCH v2 12/15] clk: sunxi-ng: Add N-K-M Factor clock Maxime Ripard
2016-06-07 20:41 ` [PATCH v2 13/15] clk: sunxi-ng: Add N-K-M-P factor clock Maxime Ripard
2016-06-21 1:42 ` Stephen Boyd
2016-06-07 20:41 ` [PATCH v2 14/15] clk: sunxi-ng: Add H3 clocks Maxime Ripard
2016-06-09 7:42 ` Jean-Francois Moine
2016-06-25 0:28 ` Michael Turquette
2016-06-26 12:34 ` Maxime Ripard
[not found] ` <146707521689.89261.8354851392822550901@resonance>
2016-06-28 8:32 ` Maxime Ripard
2016-06-07 20:41 ` [PATCH v2 15/15] ARM: dt: sun8i: switch the H3 to the new CCU driver Maxime Ripard
2016-06-21 1:48 ` [PATCH v2 00/15] clk: sunxi: introduce "modern" clock support Stephen Boyd
2016-06-26 16:24 ` Maxime Ripard
2016-06-21 9:40 ` Jean-Francois Moine
2016-06-21 14:47 ` Maxime Ripard
2016-06-21 18:29 ` Jean-Francois Moine
2016-06-27 20:46 ` Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160609094101.426a13c4c61aa6cb11df16fc@free.fr \
--to=moinejf@free.fr \
--cc=andre.przywara@arm.com \
--cc=boris.brezillon@free-electrons.com \
--cc=devicetree@vger.kernel.org \
--cc=hdegoede@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=vishnupatekar0510@gmail.com \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®