From patchwork Fri Aug 2 16:25:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 2838052 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 262D5BF53E for ; Fri, 2 Aug 2013 16:28:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9F57520299 for ; Fri, 2 Aug 2013 16:28:06 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D9E84202A7 for ; Fri, 2 Aug 2013 16:28:03 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5ICJ-00053n-2N; Fri, 02 Aug 2013 16:27:23 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5IC2-0007tj-KI; Fri, 02 Aug 2013 16:27:06 +0000 Received: from arroyo.ext.ti.com ([192.94.94.40]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V5IBX-0007mB-69 for linux-arm-kernel@lists.infradead.org; Fri, 02 Aug 2013 16:26:41 +0000 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r72GQEmR009128; Fri, 2 Aug 2013 11:26:14 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r72GQEp0013208; Fri, 2 Aug 2013 11:26:14 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Fri, 2 Aug 2013 11:26:14 -0500 Received: from sokoban.tieu.ti.com (h78-17.vpn.ti.com [172.24.78.17]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r72GQ2TR003114; Fri, 2 Aug 2013 11:26:12 -0500 From: Tero Kristo To: , , , , , Subject: [PATCHv5 04/31] CLK: TI: add autoidle support Date: Fri, 2 Aug 2013 19:25:23 +0300 Message-ID: <1375460751-23676-5-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1375460751-23676-1-git-send-email-t-kristo@ti.com> References: <1375460751-23676-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130802_122635_918899_CF5A66B8 X-CRM114-Status: GOOD ( 16.84 ) X-Spam-Score: -8.4 (--------) Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP TI 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. Signed-off-by: Tero Kristo --- .../devicetree/bindings/clock/ti/autoidle.txt | 48 ++++++++ arch/arm/mach-omap2/clock.c | 6 + drivers/clk/ti/Makefile | 2 +- drivers/clk/ti/autoidle.c | 121 ++++++++++++++++++++ include/linux/clk/ti.h | 7 ++ 5 files changed, 183 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/clock/ti/autoidle.txt create mode 100644 drivers/clk/ti/autoidle.c diff --git a/Documentation/devicetree/bindings/clock/ti/autoidle.txt b/Documentation/devicetree/bindings/clock/ti/autoidle.txt new file mode 100644 index 0000000..cc09910 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/ti/autoidle.txt @@ -0,0 +1,48 @@ +Binding for Texas Instruments autoidling clock. + +This binding uses the common clock binding[1]. Autoidle clocks +are inherited clocks from basic divider-clock [2] or +fixed-factor-clock [3] and just add autoidle support on top of +this. Autoidle is an OMAP clock feature, which allows the clock +to gate autonomously by hardware when they are no longer needed. +The autoidle feature must be enabled manually for these clocks. +Otherwise the clocks behave exactly as their base clock type. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt +[2] Documentation/devicetree/bindings/clock/divider-clock.txt +[3] Documentation/devicetree/bindings/clock/fixed-factor-clock.txt + +Required properties: +- compatible : shall be one of: + "ti,divider-clock", + "ti,fixed-factor-clock" +- ti,autoidle-shift : bit shift of the autoidle enable bit for the clock +- reg : base address for the control register of this clock + +Optional properties: +- ti,autoidle-low : autoidle is enabled by setting the bit to 0 + +Other properties as per the base clock type. + +Examples: + dpll_abe_m2x2_ck: dpll_abe_m2x2_ck@4a0051f0 { + #clock-cells = <0>; + compatible = "ti,divider-clock"; + clocks = <&dpll_abe_x2_ck>; + ti,autoidle-shift = <8>; + reg = <0x4a0051f0 0x4>; + bit-mask = <0x1f>; + index-starts-at-one; + ti,autoidle-low; + }; + + dpll_usb_clkdcoldo_ck: dpll_usb_clkdcoldo_ck@4a0081b4 { + #clock-cells = <0>; + compatible = "ti,fixed-factor-clock"; + clocks = <&dpll_usb_ck>; + ti,autoidle-shift = <8>; + clock-div = <1>; + reg = <0x4a0081b4 0x4>; + clock-mult = <1>; + ti,autoidle-low; + }; 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 @@ -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(); + return 0; } diff --git a/drivers/clk/ti/Makefile b/drivers/clk/ti/Makefile index 05af5d8..533efb4 100644 --- a/drivers/clk/ti/Makefile +++ b/drivers/clk/ti/Makefile @@ -1,3 +1,3 @@ ifneq ($(CONFIG_OF),) -obj-y += clk.o dpll.o +obj-y += clk.o dpll.o autoidle.o endif diff --git a/drivers/clk/ti/autoidle.c b/drivers/clk/ti/autoidle.c new file mode 100644 index 0000000..a52a42b --- /dev/null +++ b/drivers/clk/ti/autoidle.c @@ -0,0 +1,121 @@ +/* + * OMAP clock autoidle support + * + * Copyright (C) 2013 Texas Instruments, Inc. + * + * Tero Kristo + * + * 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 +#include +#include +#include +#include + +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 void __init 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(*clk), 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); +} + +static void __init of_omap_divider_setup(struct device_node *node) +{ + of_divider_clk_setup(node); + of_omap_autoidle_setup(node); +} +CLK_OF_DECLARE(omap_divider_clock, "ti,divider-clock", of_omap_divider_setup); + +static void __init of_omap_fixed_factor_setup(struct device_node *node) +{ + of_fixed_factor_clk_setup(node); + of_omap_autoidle_setup(node); +} +CLK_OF_DECLARE(omap_fixed_factor_clock, "ti,fixed-factor-clock", + of_omap_fixed_factor_setup); diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h index dee3234..781ef23 100644 --- a/include/linux/clk/ti.h +++ b/include/linux/clk/ti.h @@ -180,6 +180,13 @@ int omap3_dpll4_set_rate(struct clk_hw *clk, unsigned long rate, unsigned long parent_rate); void omap_dt_clocks_register(struct omap_dt_clk *oclks); +#ifdef CONFIG_OF +void of_omap_clk_allow_autoidle_all(void); +void of_omap_clk_deny_autoidle_all(void); +#else +static inline void of_omap_clk_allow_autoidle_all(void) { } +static inline void of_omap_clk_deny_autoidle_all(void) { } +#endif extern const struct clk_hw_omap_ops clkhwops_omap3_dpll; extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx;