From: nm@ti•com (Nishanth Menon)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCHv4 06/33] CLK: omap: add autoidle support
Date: Tue, 30 Jul 2013 13:56:55 -0500 [thread overview]
Message-ID: <51F80C77.9020109@ti.com> (raw)
In-Reply-To: <1374564028-11352-7-git-send-email-t-kristo@ti.com>
On 07/23/2013 02:20 AM, Tero Kristo wrote:
> OMAP clk driver now routes some of the basic clocks through own
> registration routine to allow autoidle support. This routine just
> checks a couple of device node properties and adds autoidle support
> if required, and just passes the registration forward to basic clocks.
why not extend standard framework to support autoidle capable clocks OR
introduce our own clk node which depends on basic clocks?
>
> Signed-off-by: Tero Kristo <t-kristo@ti•com>
> ---
> arch/arm/mach-omap2/clock.c | 6 ++
> drivers/clk/omap/Makefile | 2 +-
> drivers/clk/omap/autoidle.c | 130 +++++++++++++++++++++++++++++++++++++++++++
> drivers/clk/omap/clk.c | 4 +-
> include/linux/clk/omap.h | 4 ++
> 5 files changed, 143 insertions(+), 3 deletions(-)
> create mode 100644 drivers/clk/omap/autoidle.c
I know it is getting a little stale, but anyways, device tree binding
missing.
>
> diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
> index 0c38ca9..669d4c4 100644
> --- a/arch/arm/mach-omap2/clock.c
> +++ b/arch/arm/mach-omap2/clock.c
Not sure why, at this point in time we are going to calling drivers/clk
code.
> @@ -520,6 +520,9 @@ int omap2_clk_enable_autoidle_all(void)
> list_for_each_entry(c, &clk_hw_omap_clocks, node)
> if (c->ops && c->ops->allow_idle)
> c->ops->allow_idle(c);
> +
> + of_omap_clk_allow_autoidle_all();
> +
> return 0;
> }
>
> @@ -539,6 +542,9 @@ int omap2_clk_disable_autoidle_all(void)
> list_for_each_entry(c, &clk_hw_omap_clocks, node)
> if (c->ops && c->ops->deny_idle)
> c->ops->deny_idle(c);
> +
> + of_omap_clk_deny_autoidle_all();
> +
these are defined for CONFIG_OF.. anyways, without dt nodes (OMAP3 is
supposed to support non-DT boot even now), this would not work, would it?
> return 0;
> }
>
> diff --git a/drivers/clk/omap/Makefile b/drivers/clk/omap/Makefile
> index 4cad480..ca56700 100644
> --- a/drivers/clk/omap/Makefile
> +++ b/drivers/clk/omap/Makefile
> @@ -1 +1 @@
> -obj-y += clk.o dpll.o
> +obj-y += clk.o dpll.o autoidle.o
> diff --git a/drivers/clk/omap/autoidle.c b/drivers/clk/omap/autoidle.c
> new file mode 100644
> index 0000000..6424cb2
> --- /dev/null
> +++ b/drivers/clk/omap/autoidle.c
> @@ -0,0 +1,130 @@
> +/*
> + * OMAP clock autoidle support
> + *
> + * Copyright (C) 2013 Texas Instruments, Inc.
> + *
> + * Tero Kristo <t-kristo@ti•com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed "as is" WITHOUT ANY WARRANTY of any
> + * kind, whether express or implied; 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/module.h>
> +#include <linux/slab.h>
> +#include <linux/io.h>
> +#include <linux/err.h>
> +#include <linux/string.h>
> +#include <linux/log2.h>
> +#include <linux/of.h>
> +#include <linux/of_address.h>
at all of these required?
> +
> +#ifdef CONFIG_OF
> +struct clk_omap_autoidle {
> + void __iomem *reg;
> + u8 shift;
> + u8 flags;
> + const char *name;
> + struct list_head node;
> +};
> +
> +#define AUTOIDLE_LOW 0x1
> +
> +static LIST_HEAD(autoidle_clks);
> +
> +static void omap_allow_autoidle(struct clk_omap_autoidle *clk)
> +{
> + u32 val;
> +
> + val = readl(clk->reg);
> +
> + if (clk->flags & AUTOIDLE_LOW)
> + val &= ~(1 << clk->shift);
> + else
> + val |= (1 << clk->shift);
> +
> + writel(val, clk->reg);
> +}
> +
> +static void omap_deny_autoidle(struct clk_omap_autoidle *clk)
> +{
> + u32 val;
> +
> + val = readl(clk->reg);
> +
> + if (clk->flags & AUTOIDLE_LOW)
> + val |= (1 << clk->shift);
> + else
> + val &= ~(1 << clk->shift);
> +
> + writel(val, clk->reg);
> +}
> +
> +void of_omap_clk_allow_autoidle_all(void)
> +{
> + struct clk_omap_autoidle *c;
> +
> + list_for_each_entry(c, &autoidle_clks, node)
> + omap_allow_autoidle(c);
> +}
> +
> +void of_omap_clk_deny_autoidle_all(void)
> +{
> + struct clk_omap_autoidle *c;
> +
> + list_for_each_entry(c, &autoidle_clks, node)
> + omap_deny_autoidle(c);
> +}
> +
> +static __init void of_omap_autoidle_setup(struct device_node *node)
> +{
> + u32 shift;
> + void __iomem *reg;
> + struct clk_omap_autoidle *clk;
> +
> + if (of_property_read_u32(node, "ti,autoidle-shift", &shift))
> + return;
> +
> + reg = of_iomap(node, 0);
> +
> + clk = kzalloc(sizeof(struct clk_omap_autoidle), GFP_KERNEL);
> +
> + if (!clk) {
> + pr_err("%s: kzalloc failed\n", __func__);
> + return;
> + }
> +
> + clk->shift = shift;
> + clk->name = node->name;
> + clk->reg = reg;
> +
> + if (of_property_read_bool(node, "ti,autoidle-low"))
> + clk->flags |= AUTOIDLE_LOW;
> +
> + list_add(&clk->node, &autoidle_clks);
> +}
> +
> +void __init of_omap_divider_setup(struct device_node *node)
> +{
> + of_divider_clk_setup(node);
> + of_omap_autoidle_setup(node);
> +}
> +EXPORT_SYMBOL_GPL(of_omap_divider_setup);
> +CLK_OF_DECLARE(omap_autoidle_clock, "divider-clock", of_omap_divider_setup);
This is overriding drivers/clk/clk-divider.c ?
> +
> +void __init of_omap_fixed_factor_setup(struct device_node *node)
> +{
> + of_fixed_factor_clk_setup(node);
> + of_omap_autoidle_setup(node);
> +}
> +EXPORT_SYMBOL_GPL(of_omap_fixed_factor_setup);
> +CLK_OF_DECLARE(omap_fixed_factor_clock, "fixed-factor-clock",
> + of_omap_fixed_factor_setup);
This is overriding drivers/clk/clk-fixed-factor.c ?
> +
> +#endif
> diff --git a/drivers/clk/omap/clk.c b/drivers/clk/omap/clk.c
> index cd31a81..c149097 100644
> --- a/drivers/clk/omap/clk.c
> +++ b/drivers/clk/omap/clk.c
> @@ -25,8 +25,8 @@ static const struct of_device_id clk_match[] = {
> {.compatible = "fixed-clock", .data = of_fixed_clk_setup, },
> {.compatible = "mux-clock", .data = of_mux_clk_setup, },
> {.compatible = "fixed-factor-clock",
> - .data = of_fixed_factor_clk_setup, },
> - {.compatible = "divider-clock", .data = of_divider_clk_setup, },
> + .data = of_omap_fixed_factor_setup, },
> + {.compatible = "divider-clock", .data = of_omap_divider_setup, },
> {.compatible = "gate-clock", .data = of_gate_clk_setup, },
> {.compatible = "ti,omap4-dpll-clock", .data = of_omap4_dpll_setup, },
> {},
> diff --git a/include/linux/clk/omap.h b/include/linux/clk/omap.h
> index c39e775..904bdad 100644
> --- a/include/linux/clk/omap.h
> +++ b/include/linux/clk/omap.h
> @@ -192,5 +192,9 @@ extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx;
> int dt_omap_clk_init(void);
> extern void omap_dt_clocks_register(struct omap_dt_clk *oclks, int cnt);
> void of_omap4_dpll_setup(struct device_node *node);
> +void of_omap_fixed_factor_setup(struct device_node *node);
> +void of_omap_divider_setup(struct device_node *node);
> +void of_omap_clk_allow_autoidle_all(void);
> +void of_omap_clk_deny_autoidle_all(void);
>
> #endif
>
I personally dont prefer the fact that divider-clock and
fixed-rate-clock now has double meaning - building a multi-arch kernel
for example, this can wreak havoc. standard definitions should not be
monkeyed around with thus if avoidable, and in this case, very much
avoidable.
just my 2 cents.
--
Regards,
Nishanth Menon
next prev parent reply other threads:[~2013-07-30 18:56 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-23 7:19 [PATCHv4 00/33] ARM: OMAP: clock conversion to DT Tero Kristo
2013-07-23 7:19 ` [PATCHv4 01/33] CLK: clkdev: add support for looking up clocks from DT Tero Kristo
2013-07-30 15:04 ` Nishanth Menon
2013-07-31 8:43 ` Tero Kristo
2013-07-23 7:19 ` [PATCHv4 02/33] clk: omap: introduce clock driver Tero Kristo
2013-07-30 15:21 ` Nishanth Menon
2013-07-31 8:59 ` Tero Kristo
2013-08-01 13:44 ` Nishanth Menon
2013-08-01 14:59 ` Tero Kristo
2013-07-23 7:19 ` [PATCHv4 03/33] CLK: OMAP4: Add DPLL clock support Tero Kristo
2013-07-30 16:23 ` Nishanth Menon
2013-07-31 9:46 ` Tero Kristo
2013-08-01 14:00 ` Nishanth Menon
2013-08-01 15:08 ` Tero Kristo
2013-08-01 15:13 ` Nishanth Menon
2013-08-01 8:29 ` Rajendra Nayak
2013-08-01 15:10 ` Nishanth Menon
2013-08-01 15:41 ` Tero Kristo
2013-07-23 7:19 ` [PATCHv4 04/33] CLK: omap: move part of the machine specific clock header contents to driver Tero Kristo
2013-07-30 18:22 ` Nishanth Menon
2013-07-31 9:59 ` Tero Kristo
2013-08-01 14:04 ` Nishanth Menon
2013-08-01 15:12 ` Tero Kristo
2013-08-01 15:21 ` Nishanth Menon
2013-07-23 7:20 ` [PATCHv4 05/33] CLK: omap: add DT duplicate clock registration mechanism Tero Kristo
2013-07-30 18:40 ` Nishanth Menon
2013-07-31 10:07 ` Tero Kristo
2013-08-01 14:25 ` Nishanth Menon
2013-08-01 15:18 ` Tero Kristo
2013-08-01 15:24 ` Nishanth Menon
2013-08-01 15:30 ` Tero Kristo
2013-08-02 7:22 ` Tony Lindgren
2013-07-23 7:20 ` [PATCHv4 06/33] CLK: omap: add autoidle support Tero Kristo
2013-07-30 18:56 ` Nishanth Menon [this message]
2013-07-31 10:13 ` Tero Kristo
2013-08-01 14:11 ` Nishanth Menon
2013-08-01 15:22 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 07/33] CLK: omap: add support for OMAP gate clock Tero Kristo
2013-07-30 19:17 ` Nishanth Menon
2013-07-31 14:45 ` Tero Kristo
2013-08-01 14:33 ` Nishanth Menon
2013-08-01 15:29 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 08/33] ARM: dts: omap4 clock data Tero Kristo
2013-07-30 19:27 ` Nishanth Menon
2013-07-31 14:49 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 09/33] CLK: omap: add omap4 clock init file Tero Kristo
2013-07-30 19:33 ` Nishanth Menon
2013-07-31 14:52 ` Tero Kristo
2013-08-01 14:40 ` Nishanth Menon
2013-08-01 15:34 ` Tero Kristo
2013-08-01 16:10 ` Nishanth Menon
2013-07-23 7:20 ` [PATCHv4 10/33] ARM: OMAP4: remove old clock data and link in new clock init code Tero Kristo
2013-07-30 19:42 ` Nishanth Menon
2013-07-31 14:55 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 11/33] ARM: dts: omap5 clock data Tero Kristo
2013-07-23 7:20 ` [PATCHv4 12/33] CLK: omap: add omap5 clock init file Tero Kristo
2013-07-23 7:20 ` [PATCHv4 13/33] ARM: dts: dra7 clock data Tero Kristo
2013-07-23 7:20 ` [PATCHv4 14/33] CLK: omap: add dra7 clock init file Tero Kristo
2013-07-23 7:20 ` [PATCHv4 15/33] CLK: OMAP: DPLL: add support for DT property ti, dpll-no-gate Tero Kristo
2013-07-30 19:18 ` [PATCHv4 15/33] CLK: OMAP: DPLL: add support for DT property ti,dpll-no-gate Nishanth Menon
2013-07-31 14:56 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 16/33] CLK: OMAP: DPLL: do not of_iomap NULL autoidle register Tero Kristo
2013-07-30 19:49 ` Nishanth Menon
2013-07-31 14:57 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 17/33] CLK: DT: add support for set-rate-parent flag Tero Kristo
2013-07-30 19:58 ` Nishanth Menon
2013-07-23 7:20 ` [PATCHv4 18/33] ARM: dts: am33xx clock data Tero Kristo
2013-07-23 7:20 ` [PATCHv4 19/33] CLK: omap: add am33xx clock init file Tero Kristo
2013-07-30 20:00 ` Nishanth Menon
2013-07-31 14:59 ` Tero Kristo
2013-08-01 14:43 ` Nishanth Menon
2013-08-01 15:35 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 20/33] ARM: AM33xx: remove old clock data and link in new clock init code Tero Kristo
2013-07-23 7:20 ` [PATCHv4 21/33] CLK: OMAP: DPLL: add omap3 dpll support Tero Kristo
2013-07-30 20:08 ` Nishanth Menon
2013-07-31 15:03 ` Tero Kristo
2013-08-01 14:46 ` Nishanth Menon
2013-07-23 7:20 ` [PATCHv4 22/33] CLK: OMAP: update gate clock setup for OMAP3 Tero Kristo
2013-07-30 20:13 ` Nishanth Menon
2013-07-31 15:05 ` Tero Kristo
2013-07-23 7:20 ` [PATCHv4 23/33] CLK: OMAP: add interface clock support " Tero Kristo
2013-07-30 20:23 ` Nishanth Menon
2013-07-31 15:09 ` Tero Kristo
2013-08-01 14:50 ` Nishanth Menon
2013-07-23 7:20 ` [PATCHv4 24/33] CLK: OMAP: move some defines from machine to driver header Tero Kristo
2013-07-23 7:20 ` [PATCHv4 25/33] ARM: OMAP: hwmod: fix an incorrect clk type cast with _get_clkdm Tero Kristo
2013-07-23 7:20 ` [PATCHv4 26/33] CLK: omap: gate: add support for OMAP36xx dpllx_mx_ck:s Tero Kristo
2013-07-23 7:20 ` [PATCHv4 27/33] ARM: OMAP3: hwmod: initialize clkdm from clkdm_name Tero Kristo
2013-07-23 7:20 ` [PATCHv4 28/33] ARM: dts: omap3 clock data Tero Kristo
2013-07-23 7:20 ` [PATCHv4 30/33] clk: OMAP: DRA7: Add APLL support Tero Kristo
2013-07-23 7:20 ` [PATCHv4 31/33] ARM: dts: clk: Add apll related clocks Tero Kristo
2013-07-23 7:20 ` [PATCHv4 32/33] clk: OMAP: DRA7: Change apll_pcie_m2_ck to fixed factor clock Tero Kristo
2013-07-23 7:20 ` [PATCHv4 33/33] clk: DTS: DRA7: Add PCIe related clock nodes Tero Kristo
2013-07-23 8:24 ` [PATCHv4 00/33] ARM: OMAP: clock conversion to DT Tero Kristo
2013-07-24 14:16 ` Roger Quadros
2013-07-24 14:29 ` Tero Kristo
2013-07-24 14:34 ` Roger Quadros
2013-07-24 14:43 ` Tero Kristo
[not found] ` <1374564028-11352-30-git-send-email-t-kristo@ti.com>
2013-07-30 20:19 ` [PATCHv4 29/33] CLK: omap: add omap3 clock init file Nishanth Menon
2013-07-31 6:35 ` Tony Lindgren
2013-07-31 15:10 ` Tero Kristo
2013-08-02 7:24 ` Tony Lindgren
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=51F80C77.9020109@ti.com \
--to=nm@ti$(echo .)com \
--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