From: linux@prisktech•co.nz (Tony Prisk)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 07/26] clk: vt8500: parse pmc_base from clock driver
Date: Fri, 20 Sep 2013 07:02:41 +1200 [thread overview]
Message-ID: <523B4A51.4020704@prisktech.co.nz> (raw)
In-Reply-To: <1379526839-14798-8-git-send-email-sebastian.hesselbarth@gmail.com>
On 19/09/13 05:53, Sebastian Hesselbarth wrote:
> Currently, clock providers for vt8500 depend on machine_init providing
> pmc_base address before calling of_clk_init. With upcoming arch-wide
> .time_init calling of_clk_init, we should make clock providers independent
> of mach code. This adds a pmc_base parsing helper to current clock provider
> that gets called if there is no pmc_base set, yet.
>
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail•com>
> ---
> Cc: Olof Johansson <olof@lixom•net>
> Cc: Arnd Bergmann <arnd@arndb•de>
> Cc: Tony Prisk <linux@prisktech•co.nz>
> Cc: Mike Turquette <mturquette@linaro•org>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
> drivers/clk/clk-vt8500.c | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c
> index 82306f5..a5ee01c 100644
> --- a/drivers/clk/clk-vt8500.c
> +++ b/drivers/clk/clk-vt8500.c
> @@ -15,11 +15,14 @@
>
> #include <linux/io.h>
> #include <linux/of.h>
> +#include <linux/of_address.h>
> #include <linux/slab.h>
> #include <linux/bitops.h>
> #include <linux/clkdev.h>
> #include <linux/clk-provider.h>
>
> +#define LEGACY_PMC_BASE 0xD8130000
> +
> /* All clocks share the same lock as none can be changed concurrently */
> static DEFINE_SPINLOCK(_lock);
>
> @@ -626,6 +629,21 @@ const struct clk_ops vtwm_pll_ops = {
> .recalc_rate = vtwm_pll_recalc_rate,
> };
>
> +static __init void vtwm_set_pmc_base(void)
> +{
> + struct device_node *np =
> + of_find_compatible_node(NULL, NULL, "via,vt8500-pmc");
> +
> + if (np)
> + pmc_base = of_iomap(np, 0);
> + else
> + pmc_base = ioremap(LEGACY_PMC_BASE, 0x1000);
> + of_node_put(np);
> +
> + if (!pmc_base)
> + pr_err("%s:of_iomap(pmc) failed\n", __func__);
> +}
> +
> static __init void vtwm_pll_clk_init(struct device_node *node, int pll_type)
> {
> u32 reg;
> @@ -636,6 +654,9 @@ static __init void vtwm_pll_clk_init(struct device_node *node, int pll_type)
> struct clk_init_data init;
> int rc;
>
> + if (!pmc_base)
> + vtwm_set_pmc_base();
> +
> rc = of_property_read_u32(node, "reg", ®);
> if (WARN_ON(rc))
> return;
What happens if the first clock registered is a 'device clock' rather
than a 'pll'?
static __init void vtwm_device_clk_init(struct device_node *node)
{
u32 en_reg, div_reg;
struct clk *clk;
struct clk_device *dev_clk;
const char *clk_name = node->name;
const char *parent_name;
struct clk_init_data init;
int rc;
int clk_init_flags = 0;
dev_clk = kzalloc(sizeof(*dev_clk), GFP_KERNEL);
if (WARN_ON(!dev_clk))
return;
dev_clk->lock = &_lock;
rc = of_property_read_u32(node, "enable-reg", &en_reg);
if (!rc) {
dev_clk->en_reg = pmc_base + en_reg;
...
}
CLK_OF_DECLARE(vt8500_device, "via,vt8500-device-clock",
vtwm_device_clk_init);
If a device clock is initialized first, pmc_base will be null and
dev_clk->en_reg (+ other register offsets) will be incorrect.
Regards
Tony Prisk
next prev parent reply other threads:[~2013-09-19 19:02 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-18 17:53 [PATCH 00/26] ARM: provide common arch init for DT clocks Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 01/26] ARM: nomadik: move mtu setup to clocksource init Sebastian Hesselbarth
2013-09-20 20:49 ` Linus Walleij
2013-09-20 20:51 ` Linus Walleij
2013-09-20 21:08 ` Sebastian Hesselbarth
2013-09-20 21:11 ` Linus Walleij
2013-09-20 21:13 ` Sebastian Hesselbarth
2013-09-20 21:22 ` Linus Walleij
2013-09-22 12:18 ` Sebastian Hesselbarth
2013-09-20 21:37 ` [PATCH v2 01/26] ARM: nomadik: remove mtu initalization from .init_time Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 02/26] clk: nomadik: move src init out of nomadik_clk_init Sebastian Hesselbarth
2013-09-20 20:54 ` Linus Walleij
2013-09-22 16:45 ` [PATCH v2 " Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 03/26] clk: nomadik: declare OF clock provider Sebastian Hesselbarth
2013-09-20 20:55 ` Linus Walleij
2013-09-22 16:46 ` [PATCH v2 " Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 04/26] clk: prima2: " Sebastian Hesselbarth
2013-09-19 8:45 ` Barry Song
2013-09-19 8:48 ` Sebastian Hesselbarth
2013-09-22 12:12 ` Sebastian Hesselbarth
2013-09-22 10:37 ` Barry Song
2013-09-27 18:21 ` Sebastian Hesselbarth
2013-09-29 4:49 ` Barry Song
2013-09-18 17:53 ` [PATCH 05/26] ARM: socfgpa: prepare for arch-wide .init_time callback Sebastian Hesselbarth
2013-09-26 6:12 ` Sebastian Hesselbarth
2013-09-26 13:06 ` Dinh Nguyen
2013-09-18 17:53 ` [PATCH 06/26] clk: sunxi: declare OF clock provider Sebastian Hesselbarth
2013-09-25 20:03 ` Maxime Ripard
2013-09-18 17:53 ` [PATCH 07/26] clk: vt8500: parse pmc_base from clock driver Sebastian Hesselbarth
2013-09-19 19:02 ` Tony Prisk [this message]
2013-09-19 19:12 ` Sebastian Hesselbarth
2013-09-20 4:51 ` Tony Prisk
2013-09-20 6:23 ` Sebastian Hesselbarth
2013-09-20 18:23 ` Tony Prisk
2013-09-20 6:22 ` [PATCH v2 " Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 08/26] ARM: vt8500: prepare for arch-wide .init_time callback Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 09/26] ARM: call of_clk_init from default time_init handler Sebastian Hesselbarth
2013-09-23 7:54 ` [PATCH v2 " Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 10/26] ARM: bcm2835: remove custom .init_time hook Sebastian Hesselbarth
2013-09-18 19:37 ` Stephen Warren
2013-09-18 17:53 ` [PATCH 11/26] ARM: dove: " Sebastian Hesselbarth
2013-09-21 12:22 ` Andrew Lunn
2013-09-22 12:20 ` Sebastian Hesselbarth
2013-09-23 9:10 ` Andrew Lunn
2013-09-23 13:32 ` Jason Cooper
2013-09-23 17:46 ` Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 12/26] ARM: exynos: " Sebastian Hesselbarth
2013-09-26 6:21 ` Sebastian Hesselbarth
2013-09-26 8:08 ` Tomasz Figa
2013-09-18 17:53 ` [PATCH 13/26] ARM: highbank: " Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 14/26] ARM: imx: " Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 15/26] ARM: kirkwood: " Sebastian Hesselbarth
2013-09-21 20:27 ` Andrew Lunn
2013-09-23 13:32 ` Jason Cooper
2013-09-18 17:53 ` [PATCH 16/26] ARM: mxs: " Sebastian Hesselbarth
2013-09-20 8:57 ` Shawn Guo
2013-09-18 17:53 ` [PATCH 17/26] ARM: nomadik: " Sebastian Hesselbarth
2013-09-20 20:56 ` Linus Walleij
2013-09-18 17:53 ` [PATCH 18/26] ARM: nspire: " Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 19/26] ARM: prima2: " Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 20/26] ARM: rockchip: " Sebastian Hesselbarth
2013-09-19 8:40 ` Heiko Stübner
2013-09-18 17:53 ` [PATCH 21/26] ARM: socfpga: " Sebastian Hesselbarth
2013-09-26 13:07 ` Dinh Nguyen
2013-09-18 17:53 ` [PATCH 22/26] ARM: sti: " Sebastian Hesselbarth
2013-09-18 17:53 ` [PATCH 23/26] ARM: sunxi: " Sebastian Hesselbarth
2013-09-25 20:07 ` Maxime Ripard
2013-09-26 6:15 ` Sebastian Hesselbarth
2013-09-27 17:02 ` Maxime Ripard
2013-09-18 17:53 ` [PATCH 24/26] ARM: tegra: " Sebastian Hesselbarth
2013-09-18 19:38 ` Stephen Warren
2013-09-18 17:53 ` [PATCH 25/26] ARM: vexpress: " Sebastian Hesselbarth
2013-09-19 13:34 ` Pawel Moll
2013-09-18 17:53 ` [PATCH 26/26] ARM: vt8500: " Sebastian Hesselbarth
2013-09-18 19:47 ` [PATCH 00/26] ARM: provide common arch init for DT clocks Jason Cooper
2013-09-18 19:52 ` Sebastian Hesselbarth
2013-09-18 20:45 ` Stephen Warren
2013-09-18 20:48 ` Olof Johansson
2013-09-18 21:04 ` Sebastian Hesselbarth
2013-09-20 19:16 ` Matt Porter
2013-09-22 12:14 ` Sebastian Hesselbarth
2013-09-23 17:45 ` Matt Porter
2013-09-23 18:41 ` Christian Daudt
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=523B4A51.4020704@prisktech.co.nz \
--to=linux@prisktech$(echo .)co.nz \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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