From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Chen-Yu Tsai <wens@csie.org>
Cc: Mike Turquette <mturquette@linaro.org>,
Stephen Boyd <sboyd@codeaurora.org>,
Emilio Lopez <emilio@elopez.com.ar>,
Hans de Goede <hdegoede@redhat.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
linux-clk <linux-clk@vger.kernel.org>
Subject: Re: [PATCH 3/8] clk: sunxi: Add a driver for the PLL2
Date: Fri, 15 May 2015 09:45:20 +0200 [thread overview]
Message-ID: <20150515074520.GR4004@lukather> (raw)
In-Reply-To: <CAGb2v64jVksA5rapnAPn9yefEeXnfFw5FwdnXPP0G9FvzWnVBg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 6147 bytes --]
On Thu, May 14, 2015 at 05:43:51PM +0800, Chen-Yu Tsai wrote:
> Hi,
>
> On Sat, May 2, 2015 at 7:24 PM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
> > The PLL2 on the A10 and later SoCs is the clock used for all the audio
> > related operations.
> >
> > This clock has a somewhat complex output tree, with three outputs (2X, 4X
> > and 8X) with a fixed divider from the base clock, and an output (1X) with a
> > post divider.
> >
> > However, we can simplify things since the 1X divider can be fixed, and we
> > end up by having a base clock not exposed to any device (or at least
> > directly, since the 4X output doesn't have any divider), and 4 fixed
> > divider clocks that will be exposed.
> >
> > This clock seems to have been introduced, at least in this form, in the
> > revision B of the A10, but we don't have any information on the clock used
> > on the revision A.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > ---
> > drivers/clk/sunxi/Makefile | 1 +
> > drivers/clk/sunxi/clk-a10-pll2.c | 176 +++++++++++++++++++++++++++++
> > include/dt-bindings/clock/sun4i-a10-pll2.h | 53 +++++++++
> > 3 files changed, 230 insertions(+)
> > create mode 100644 drivers/clk/sunxi/clk-a10-pll2.c
> > create mode 100644 include/dt-bindings/clock/sun4i-a10-pll2.h
> >
> > diff --git a/drivers/clk/sunxi/Makefile b/drivers/clk/sunxi/Makefile
> > index 058f273d6154..eb36c38d4120 100644
> > --- a/drivers/clk/sunxi/Makefile
> > +++ b/drivers/clk/sunxi/Makefile
> > @@ -4,6 +4,7 @@
> >
> > obj-y += clk-sunxi.o clk-factors.o
> > obj-y += clk-a10-hosc.o
> > +obj-y += clk-a10-pll2.o
> > obj-y += clk-a20-gmac.o
> > obj-y += clk-mod0.o
> > obj-y += clk-sun8i-mbus.o
> > diff --git a/drivers/clk/sunxi/clk-a10-pll2.c b/drivers/clk/sunxi/clk-a10-pll2.c
> > new file mode 100644
> > index 000000000000..4d0369626dba
> > --- /dev/null
> > +++ b/drivers/clk/sunxi/clk-a10-pll2.c
> > @@ -0,0 +1,176 @@
> > +/*
> > + * Copyright 2013 Emilio López
> > + * Emilio López <emilio@elopez.com.ar>
> > + *
> > + * Copyright 2015 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.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > + */
> > +
> > +#include <linux/clk-provider.h>
> > +#include <linux/of.h>
> > +#include <linux/of_address.h>
> > +#include <linux/slab.h>
> > +
> > +#include <dt-bindings/clock/sun4i-a10-pll2.h>
> > +
> > +#include "clk-factors.h"
> > +
> > +#define SUN4I_PLL2_ENABLE 31
> > +#define SUN4I_PLL2_POST_DIV 26
> > +#define SUN4I_PLL2_POST_DIV_MASK 0xF
> > +#define SUN4I_PLL2_N 8
> > +#define SUN4I_PLL2_N_MASK 0x7F
> > +#define SUN4I_PLL2_PRE_DIV 0
> > +#define SUN4I_PLL2_PRE_DIV_MASK 0x1F
> > +
> > +#define SUN4I_PLL2_POST_DIV_VALUE 21
> > +#define SUN4I_PLL2_PRE_DIV_VALUE 4
> > +
> > +#define SUN4I_PLL2_OUTPUTS 4
> > +
> > +static void sun4i_a10_get_pll2_base_factors(u32 *freq, u32 parent_rate,
> > + u8 *n, u8 *k, u8 *m, u8 *p)
> > +{
> > + /*
> > + * Normalize the frequency to a multiple of (24 MHz / Fixed
> > + * PRE-DIV)
> > + */
> > + *freq = round_down(*freq, parent_rate / SUN4I_PLL2_PRE_DIV_VALUE);
> > +
> > + /* We were called to round the frequency, we can return */
> > + if (!n)
> > + return;
> > +
> > + *n = *freq * SUN4I_PLL2_PRE_DIV_VALUE / parent_rate;
> > +
> > + /*
> > + * Even though the pre-divider can be changed, we don't really
> > + * care and we can just fix it to 4.
> > + */
> > + *m = SUN4I_PLL2_PRE_DIV_VALUE;
> > +}
> > +
> > +static struct clk_factors_config sun4i_a10_pll2_base_config = {
> > + .mshift = SUN4I_PLL2_PRE_DIV,
> > + .mwidth = 5,
> > + .nshift = SUN4I_PLL2_N,
> > + .nwidth = 7,
> > +
> > + .m_zero = 1,
> > + .n_zero = 1,
> > +};
> > +
> > +static const struct factors_data sun4i_a10_pll2_base_data __initconst = {
> > + .enable = SUN4I_PLL2_ENABLE,
> > + .table = &sun4i_a10_pll2_base_config,
> > + .getter = sun4i_a10_get_pll2_base_factors,
> > + .name = "pll2-base",
> > +};
> > +
> > +static DEFINE_SPINLOCK(sun4i_a10_pll2_lock);
> > +
> > +static void __init sun4i_pll2_setup(struct device_node *node)
> > +{
> > + const char *clk_name = node->name, *parent;
> > + struct clk_onecell_data *clk_data;
> > + struct clk **clks, *base_clk;
> > + void __iomem *reg;
> > + u32 val;
> > +
> > + reg = of_io_request_and_map(node, 0, of_node_full_name(node));
> > + if (IS_ERR(reg))
> > + return;
> > +
> > + clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL);
> > + if (!clk_data)
> > + goto err_unmap;
> > +
> > + clks = kcalloc(SUN4I_PLL2_OUTPUTS, sizeof(struct clk *), GFP_KERNEL);
> > + if (!clks)
> > + goto err_free_data;
> > +
> > + base_clk = sunxi_factors_register(node, &sun4i_a10_pll2_base_data,
> > + &sun4i_a10_pll2_lock, reg);
>
> Why aren't you using divs_clk for this? It seems right for the job.
As far as I know, divs_clk can only handle a single divider, and not
two subsequent dividers like this one uses.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: maxime.ripard@free-electrons.com (Maxime Ripard)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/8] clk: sunxi: Add a driver for the PLL2
Date: Fri, 15 May 2015 09:45:20 +0200 [thread overview]
Message-ID: <20150515074520.GR4004@lukather> (raw)
In-Reply-To: <CAGb2v64jVksA5rapnAPn9yefEeXnfFw5FwdnXPP0G9FvzWnVBg@mail.gmail.com>
On Thu, May 14, 2015 at 05:43:51PM +0800, Chen-Yu Tsai wrote:
> Hi,
>
> On Sat, May 2, 2015 at 7:24 PM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
> > The PLL2 on the A10 and later SoCs is the clock used for all the audio
> > related operations.
> >
> > This clock has a somewhat complex output tree, with three outputs (2X, 4X
> > and 8X) with a fixed divider from the base clock, and an output (1X) with a
> > post divider.
> >
> > However, we can simplify things since the 1X divider can be fixed, and we
> > end up by having a base clock not exposed to any device (or at least
> > directly, since the 4X output doesn't have any divider), and 4 fixed
> > divider clocks that will be exposed.
> >
> > This clock seems to have been introduced, at least in this form, in the
> > revision B of the A10, but we don't have any information on the clock used
> > on the revision A.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > ---
> > drivers/clk/sunxi/Makefile | 1 +
> > drivers/clk/sunxi/clk-a10-pll2.c | 176 +++++++++++++++++++++++++++++
> > include/dt-bindings/clock/sun4i-a10-pll2.h | 53 +++++++++
> > 3 files changed, 230 insertions(+)
> > create mode 100644 drivers/clk/sunxi/clk-a10-pll2.c
> > create mode 100644 include/dt-bindings/clock/sun4i-a10-pll2.h
> >
> > diff --git a/drivers/clk/sunxi/Makefile b/drivers/clk/sunxi/Makefile
> > index 058f273d6154..eb36c38d4120 100644
> > --- a/drivers/clk/sunxi/Makefile
> > +++ b/drivers/clk/sunxi/Makefile
> > @@ -4,6 +4,7 @@
> >
> > obj-y += clk-sunxi.o clk-factors.o
> > obj-y += clk-a10-hosc.o
> > +obj-y += clk-a10-pll2.o
> > obj-y += clk-a20-gmac.o
> > obj-y += clk-mod0.o
> > obj-y += clk-sun8i-mbus.o
> > diff --git a/drivers/clk/sunxi/clk-a10-pll2.c b/drivers/clk/sunxi/clk-a10-pll2.c
> > new file mode 100644
> > index 000000000000..4d0369626dba
> > --- /dev/null
> > +++ b/drivers/clk/sunxi/clk-a10-pll2.c
> > @@ -0,0 +1,176 @@
> > +/*
> > + * Copyright 2013 Emilio L?pez
> > + * Emilio L?pez <emilio@elopez.com.ar>
> > + *
> > + * Copyright 2015 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.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > + */
> > +
> > +#include <linux/clk-provider.h>
> > +#include <linux/of.h>
> > +#include <linux/of_address.h>
> > +#include <linux/slab.h>
> > +
> > +#include <dt-bindings/clock/sun4i-a10-pll2.h>
> > +
> > +#include "clk-factors.h"
> > +
> > +#define SUN4I_PLL2_ENABLE 31
> > +#define SUN4I_PLL2_POST_DIV 26
> > +#define SUN4I_PLL2_POST_DIV_MASK 0xF
> > +#define SUN4I_PLL2_N 8
> > +#define SUN4I_PLL2_N_MASK 0x7F
> > +#define SUN4I_PLL2_PRE_DIV 0
> > +#define SUN4I_PLL2_PRE_DIV_MASK 0x1F
> > +
> > +#define SUN4I_PLL2_POST_DIV_VALUE 21
> > +#define SUN4I_PLL2_PRE_DIV_VALUE 4
> > +
> > +#define SUN4I_PLL2_OUTPUTS 4
> > +
> > +static void sun4i_a10_get_pll2_base_factors(u32 *freq, u32 parent_rate,
> > + u8 *n, u8 *k, u8 *m, u8 *p)
> > +{
> > + /*
> > + * Normalize the frequency to a multiple of (24 MHz / Fixed
> > + * PRE-DIV)
> > + */
> > + *freq = round_down(*freq, parent_rate / SUN4I_PLL2_PRE_DIV_VALUE);
> > +
> > + /* We were called to round the frequency, we can return */
> > + if (!n)
> > + return;
> > +
> > + *n = *freq * SUN4I_PLL2_PRE_DIV_VALUE / parent_rate;
> > +
> > + /*
> > + * Even though the pre-divider can be changed, we don't really
> > + * care and we can just fix it to 4.
> > + */
> > + *m = SUN4I_PLL2_PRE_DIV_VALUE;
> > +}
> > +
> > +static struct clk_factors_config sun4i_a10_pll2_base_config = {
> > + .mshift = SUN4I_PLL2_PRE_DIV,
> > + .mwidth = 5,
> > + .nshift = SUN4I_PLL2_N,
> > + .nwidth = 7,
> > +
> > + .m_zero = 1,
> > + .n_zero = 1,
> > +};
> > +
> > +static const struct factors_data sun4i_a10_pll2_base_data __initconst = {
> > + .enable = SUN4I_PLL2_ENABLE,
> > + .table = &sun4i_a10_pll2_base_config,
> > + .getter = sun4i_a10_get_pll2_base_factors,
> > + .name = "pll2-base",
> > +};
> > +
> > +static DEFINE_SPINLOCK(sun4i_a10_pll2_lock);
> > +
> > +static void __init sun4i_pll2_setup(struct device_node *node)
> > +{
> > + const char *clk_name = node->name, *parent;
> > + struct clk_onecell_data *clk_data;
> > + struct clk **clks, *base_clk;
> > + void __iomem *reg;
> > + u32 val;
> > +
> > + reg = of_io_request_and_map(node, 0, of_node_full_name(node));
> > + if (IS_ERR(reg))
> > + return;
> > +
> > + clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL);
> > + if (!clk_data)
> > + goto err_unmap;
> > +
> > + clks = kcalloc(SUN4I_PLL2_OUTPUTS, sizeof(struct clk *), GFP_KERNEL);
> > + if (!clks)
> > + goto err_free_data;
> > +
> > + base_clk = sunxi_factors_register(node, &sun4i_a10_pll2_base_data,
> > + &sun4i_a10_pll2_lock, reg);
>
> Why aren't you using divs_clk for this? It seems right for the job.
As far as I know, divs_clk can only handle a single divider, and not
two subsequent dividers like this one uses.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150515/2f099d3d/attachment-0001.sig>
next prev parent reply other threads:[~2015-05-15 7:45 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-02 11:24 [PATCH 0/8] clk: sunxi: Add support for the Audio PLL Maxime Ripard
2015-05-02 11:24 ` Maxime Ripard
2015-05-02 11:24 ` [PATCH 1/8] clk: sunxi: factors: Add m_start parameters Maxime Ripard
2015-05-02 11:24 ` Maxime Ripard
2015-05-14 9:12 ` Chen-Yu Tsai
2015-05-14 9:12 ` Chen-Yu Tsai
2015-05-15 7:43 ` Maxime Ripard
2015-05-15 7:43 ` Maxime Ripard
2015-05-15 7:48 ` Chen-Yu Tsai
2015-05-15 7:48 ` Chen-Yu Tsai
2015-05-15 8:05 ` Maxime Ripard
2015-05-15 8:05 ` Maxime Ripard
2015-05-15 9:11 ` Chen-Yu Tsai
2015-05-15 9:11 ` Chen-Yu Tsai
2015-05-15 14:21 ` Maxime Ripard
2015-05-15 14:21 ` Maxime Ripard
2015-05-02 11:24 ` [PATCH 2/8] clk: sunxi: factors: Add a parameter for N and M zeros Maxime Ripard
2015-05-02 11:24 ` Maxime Ripard
2015-05-02 11:24 ` [PATCH 3/8] clk: sunxi: Add a driver for the PLL2 Maxime Ripard
2015-05-02 11:24 ` Maxime Ripard
2015-05-14 9:43 ` Chen-Yu Tsai
2015-05-14 9:43 ` Chen-Yu Tsai
2015-05-15 7:45 ` Maxime Ripard [this message]
2015-05-15 7:45 ` Maxime Ripard
2015-05-15 9:15 ` Chen-Yu Tsai
2015-05-15 9:15 ` Chen-Yu Tsai
2015-05-15 14:44 ` Maxime Ripard
2015-05-15 14:44 ` Maxime Ripard
2015-05-19 7:58 ` Chen-Yu Tsai
2015-05-19 7:58 ` Chen-Yu Tsai
2015-05-19 20:53 ` Maxime Ripard
2015-05-19 20:53 ` Maxime Ripard
2015-05-02 11:24 ` [PATCH 4/8] clk: sunxi: codec clock support Maxime Ripard
2015-05-02 11:24 ` Maxime Ripard
2015-05-14 11:03 ` Chen-Yu Tsai
2015-05-14 11:03 ` Chen-Yu Tsai
2015-05-15 7:46 ` Maxime Ripard
2015-05-15 7:46 ` Maxime Ripard
2015-05-02 11:24 ` [PATCH 5/8] clk: sunxi: mod1 " Maxime Ripard
2015-05-02 11:24 ` Maxime Ripard
2015-05-14 13:43 ` Chen-Yu Tsai
2015-05-14 13:43 ` Chen-Yu Tsai
2015-05-15 7:41 ` Maxime Ripard
2015-05-15 7:41 ` Maxime Ripard
2015-05-02 11:24 ` [PATCH 6/8] ARM: sunxi: Add PLL2 support Maxime Ripard
2015-05-02 11:24 ` Maxime Ripard
2015-05-02 11:24 ` [PATCH 7/8] ARM: sunxi: Add codec clock support Maxime Ripard
2015-05-02 11:24 ` Maxime Ripard
2015-05-14 12:43 ` Chen-Yu Tsai
2015-05-14 12:43 ` Chen-Yu Tsai
2015-05-02 11:24 ` [PATCH 8/8] ARM: sun7i: Add mod1 clock nodes Maxime Ripard
2015-05-02 11:24 ` 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=20150515074520.GR4004@lukather \
--to=maxime.ripard@free-electrons.com \
--cc=emilio@elopez.com.ar \
--cc=hdegoede@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=mturquette@linaro.org \
--cc=sboyd@codeaurora.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.