Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753426Ab3DLKaq (ORCPT ); Fri, 12 Apr 2013 06:30:46 -0400 Received: from mail.abilis.ch ([195.70.19.74]:22421 "EHLO mail.abilis.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751998Ab3DLKap convert rfc822-to-8bit (ORCPT ); Fri, 12 Apr 2013 06:30:45 -0400 Date: Fri, 12 Apr 2013 12:30:10 +0200 From: Christian Ruppert To: Gregory CLEMENT Cc: Mike Turquette , Grant Likely , Rob Herring , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.or, Shawn Guo Subject: Re: [PATCH v2] clk: add device tree fixed-factor-clock binding support Message-ID: <20130412103007.GE29291@ab42.lan> References: <1365760708-4763-1-git-send-email-gregory.clement@free-electrons.com> <1365760708-4763-2-git-send-email-gregory.clement@free-electrons.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8BIT In-Reply-To: <1365760708-4763-2-git-send-email-gregory.clement@free-electrons.com> User-Agent: Mutt/1.5.20 (2009-12-10) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4460 Lines: 128 Hi Gregory, Just tested the patch and it works perfectly. Did you forget to update Documentation/devicetree/bindings/clock/fixed-factor-clock.txt, however? Greetings, Christian On Fri, Apr 12, 2013 at 11:58:28AM +0200, Gregory CLEMENT wrote: > Add support for DT "fixed-factor-clock" binding to the common fixed > factor clock support. > > Signed-off-by: Gregory CLEMENT > --- > .../bindings/clock/fixed-factor-clock.txt | 24 +++++++++++++ > drivers/clk/clk-fixed-factor.c | 36 ++++++++++++++++++++ > include/linux/clk-provider.h | 2 ++ > 3 files changed, 62 insertions(+) > create mode 100644 Documentation/devicetree/bindings/clock/fixed-factor-clock.txt > > diff --git a/Documentation/devicetree/bindings/clock/fixed-factor-clock.txt b/Documentation/devicetree/bindings/clock/fixed-factor-clock.txt > new file mode 100644 > index 0000000..7ed236f > --- /dev/null > +++ b/Documentation/devicetree/bindings/clock/fixed-factor-clock.txt > @@ -0,0 +1,24 @@ > +Binding for simple fixed factor rate clock sources. > + > +This binding uses the common clock binding[1]. > + > +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt > + > +Required properties: > +- compatible : shall be "fixed-factor-clock". > +- #clock-cells : from common clock binding; shall be set to 0. > +- div: fixed divider. > +- mult: fixed multiplier. > +- clocks: parent clock. > + > +Optional properties: > +- clock-output-names : From common clock binding. > + > +Example: > + clock { > + compatible = "fixed-factor-clock"; > + clocks = <&parentclk>; > + #clock-cells = <0>; > + div = <2>; > + mult = <1>; > + }; > diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c > index 1ef271e..9ff7d51 100644 > --- a/drivers/clk/clk-fixed-factor.c > +++ b/drivers/clk/clk-fixed-factor.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > > /* > * DOC: basic fixed multiplier and divider clock that cannot gate > @@ -96,3 +97,38 @@ struct clk *clk_register_fixed_factor(struct device *dev, const char *name, > > return clk; > } > +#ifdef CONFIG_OF > +/** > + * of_fixed_factor_clk_setup() - Setup function for simple fixed factor clock > + */ > +void __init of_fixed_factor_clk_setup(struct device_node *node) > +{ > + struct clk *clk; > + const char *clk_name = node->name; > + const char *parent_name; > + u32 div, mult; > + > + if (of_property_read_u32(node, "clock-div", &div)) { > + pr_err("%s Fixed factor clock <%s> must have a clock-div property\n", > + __func__, node->name); > + return; > + } > + > + if (of_property_read_u32(node, "clock-mult", &mult)) { > + pr_err("%s Fixed factor clock <%s> must have a clokc-mult property\n", > + __func__, node->name); > + return; > + } > + > + of_property_read_string(node, "clock-output-names", &clk_name); > + parent_name = of_clk_get_parent_name(node, 0); > + > + clk = clk_register_fixed_factor(NULL, clk_name, parent_name, 0, > + mult, div); > + if (!IS_ERR(clk)) > + of_clk_add_provider(node, of_clk_src_simple_get, clk); > +} > +EXPORT_SYMBOL_GPL(of_fixed_factor_clk_setup); > +CLK_OF_DECLARE(fixed_factor_clk, "fixed-factor-clock", > + of_fixed_factor_clk_setup); > +#endif > diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h > index 7f197d7..7ea501b 100644 > --- a/include/linux/clk-provider.h > +++ b/include/linux/clk-provider.h > @@ -325,6 +325,8 @@ struct clk *clk_register_fixed_factor(struct device *dev, const char *name, > const char *parent_name, unsigned long flags, > unsigned int mult, unsigned int div); > > +void of_fixed_factor_clk_setup(struct device_node *node); > + > /** > * clk_register - allocate a new clock, register it and return an opaque cookie > * @dev: device that is registering this clock > -- > 1.7.9.5 > -- Christian Ruppert , /| Tel: +41/(0)22 816 19-42 //| 3, Chemin du Pr?-Fleuri _// | bilis Systems CH-1228 Plan-les-Ouates -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/