Message ID | 1368039976-29648-2-git-send-email-nm@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Quoting Nishanth Menon (2013-05-08 12:06:11) <snip> > Overall strategy introduced here is simple: a clock node described in > device tree blob is used to identify the exact clock provided in the > SoC specific data. This is then linked back using of_clk_add_provider > to the device node to be accessible by of_clk_get. > FYI, I'm working on moving the OMAP clocks over to DT which is a better alternative than this patch. I'll share what I have on the list, hopefully next week. Regards, Mike > Based on discussion contributions from Roger Quadros, Grygorii Strashko > and others. > > Cc: Kevin Hilman <khilman@deeprootsystems.com> > Cc: Mike Turquette <mturquette@linaro.org> > Cc: Paul Walmsley <paul@pwsan.com> > [tony@atomide.com: co-developed] > Signed-off-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Nishanth Menon <nm@ti.com> > --- > Changes in this version: > - review comments incorporated. > Previous version of this patch was discussed in: > http://marc.info/?t=136580758500001&r=1&w=2 > > .../devicetree/bindings/clock/omap-clock.txt | 40 +++++++++ > drivers/clk/Makefile | 1 + > drivers/clk/omap/Makefile | 1 + > drivers/clk/omap/clk.c | 91 ++++++++++++++++++++ > 4 files changed, 133 insertions(+) > create mode 100644 Documentation/devicetree/bindings/clock/omap-clock.txt > create mode 100644 drivers/clk/omap/Makefile > create mode 100644 drivers/clk/omap/clk.c > > diff --git a/Documentation/devicetree/bindings/clock/omap-clock.txt b/Documentation/devicetree/bindings/clock/omap-clock.txt > new file mode 100644 > index 0000000..047c1e7 > --- /dev/null > +++ b/Documentation/devicetree/bindings/clock/omap-clock.txt > @@ -0,0 +1,40 @@ > +Device Tree Clock bindings for Texas Instrument's OMAP compatible platforms > + > +This binding is an initial minimal binding that may be enhanced as part of > +transitioning OMAP clock data out of kernel image. > + > +This binding uses the common clock binding[1]. > + > +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt > + > +Required properties: > +- compatible : shall be "ti,omap-clock" > +- #clock-cells : from common clock binding; shall be set to 0. > +NOTE: > +node name should map to clock database in arch/arm/mach-omap2/cclock<SoC>_data.c > +Since all clocks are described with _ck, the node name is optimized to drop the > +usage of _ck. For example, a clock called dpll1_ck will be defined as dpll1. > + > +Example #1: describing clock node for CPU on OMAP34xx platform: > +Ref: arch/arm/mach-omap2/cclock3xxx_data.c > +describes the CPU clock to be as follows > + CLK(NULL, "dpll1_ck", &dpll1_ck, CK_3XXX), > +Corresponding binding will be: > + dpll1: dpll1 { > + #clock-cells = <0>; > + compatible = "ti,omap-clock"; > + }; > +And it's usage will be: > + clocks = <&dpll1>; > + > +Example #2: describing clock node for auxilary clock #3 on OMAP443x platform: > +Ref: arch/arm/mach-omap2/cclock44xx_data.c > +describes the auxclk3 clock to be as follows: > + CLK(NULL, "auxclk3_ck", &auxclk3_ck, CK_443X), > +Corresponding binding will be: > + auxclk3: auxclk3 { > + #clock-cells = <0>; > + compatible = "ti,omap-clock"; > + }; > +And it's usage will be: > + clocks = <&auxclk3>; > diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile > index 137d3e7..1d5a2ec 100644 > --- a/drivers/clk/Makefile > +++ b/drivers/clk/Makefile > @@ -30,6 +30,7 @@ obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o > obj-$(CONFIG_ARCH_ZYNQ) += clk-zynq.o > obj-$(CONFIG_ARCH_TEGRA) += tegra/ > obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ > +obj-$(CONFIG_ARCH_OMAP) += omap/ > > obj-$(CONFIG_X86) += x86/ > > diff --git a/drivers/clk/omap/Makefile b/drivers/clk/omap/Makefile > new file mode 100644 > index 0000000..8195931 > --- /dev/null > +++ b/drivers/clk/omap/Makefile > @@ -0,0 +1 @@ > +obj-y += clk.o > diff --git a/drivers/clk/omap/clk.c b/drivers/clk/omap/clk.c > new file mode 100644 > index 0000000..5a3c6d9 > --- /dev/null > +++ b/drivers/clk/omap/clk.c > @@ -0,0 +1,91 @@ > +/* > + * Texas Instruments OMAP Clock driver > + * > + * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ > + * Nishanth Menon <nm@ti.com> > + * Tony Lindgren <tony@atomide.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/clkdev.h> > +#include <linux/clk-provider.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/of_device.h> > +#include <linux/platform_device.h> > +#include <linux/string.h> > + > +static const struct of_device_id omap_clk_of_match[] = { > + {.compatible = "ti,omap-clock",}, > + {}, > +}; > + > +/** > + * omap_clk_src_get() - Get OMAP clock from node name when needed > + * @clkspec: clkspec argument > + * @data: unused > + * > + * REVISIT: We assume the following: > + * 1. omap clock names end with _ck > + * 2. omap clock names are under 32 characters in length > + */ > +static struct clk *omap_clk_src_get(struct of_phandle_args *clkspec, void *data) > +{ > + struct clk *clk; > + char clk_name[32]; > + struct device_node *np = clkspec->np; > + > + snprintf(clk_name, 32, "%s_ck", np->name); > + clk = clk_get(NULL, clk_name); > + if (IS_ERR(clk)) > + pr_err("%s: could not get clock %s(%ld)\n", __func__, > + clk_name, PTR_ERR(clk)); > + > + return clk; > +} > + > +/** > + * omap_clk_probe() - create link from DT definition to clock data > + * @pdev: device node > + * > + * NOTE: we look up the clock lazily when the consumer driver does > + * of_clk_get() and initialize a NULL clock here. > + */ > +static int omap_clk_probe(struct platform_device *pdev) > +{ > + int res; > + struct device_node *np = pdev->dev.of_node; > + > + /* This allows the driver to of_clk_get() */ > + res = of_clk_add_provider(np, omap_clk_src_get, NULL); > + if (res) > + dev_err(&pdev->dev, "could not add provider(%d)\n", res); > + > + return res; > +} > + > +static struct platform_driver omap_clk_driver = { > + .probe = omap_clk_probe, > + .driver = { > + .name = "omap_clk", > + .of_match_table = of_match_ptr(omap_clk_of_match), > + }, > +}; > + > +static int __init omap_clk_init(void) > +{ > + return platform_driver_register(&omap_clk_driver); > +} > +arch_initcall(omap_clk_init); > + > +MODULE_DESCRIPTION("OMAP Clock driver"); > +MODULE_AUTHOR("Texas Instruments Inc."); > +MODULE_LICENSE("GPL v2"); > -- > 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Mike Turquette <mturquette@linaro.org> [130513 16:56]: > Quoting Nishanth Menon (2013-05-08 12:06:11) > <snip> > > Overall strategy introduced here is simple: a clock node described in > > device tree blob is used to identify the exact clock provided in the > > SoC specific data. This is then linked back using of_clk_add_provider > > to the device node to be accessible by of_clk_get. > > > > FYI, I'm working on moving the OMAP clocks over to DT which is a better > alternative than this patch. I'll share what I have on the list, > hopefully next week. That's good news! What's your plan on using the indexing the clocks? I'd rather avoid indexing as that's basically same as the old IRQ numbering and GPIO numbering schemes that don't work well in the long term. We already have quite a few sets of clocks for omaps, so the indexing is already an issue. My thinking is that indexing should only be used if the same physical clock has multiple outputs. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Mike Turquette <mturquette@linaro.org> [130516 12:52]: > Quoting Tony Lindgren (2013-05-16 10:43:56) > > * Mike Turquette <mturquette@linaro.org> [130513 16:56]: > > > Quoting Nishanth Menon (2013-05-08 12:06:11) > > > <snip> > > > > Overall strategy introduced here is simple: a clock node described in > > > > device tree blob is used to identify the exact clock provided in the > > > > SoC specific data. This is then linked back using of_clk_add_provider > > > > to the device node to be accessible by of_clk_get. > > > > > > > > > > FYI, I'm working on moving the OMAP clocks over to DT which is a better > > > alternative than this patch. I'll share what I have on the list, > > > hopefully next week. > > > > That's good news! What's your plan on using the indexing the clocks? > > > > I'd rather avoid indexing as that's basically same as the old IRQ > > numbering and GPIO numbering schemes that don't work well in the long > > term. > > > > We already have quite a few sets of clocks for omaps, so the indexing > > is already an issue. My thinking is that indexing should only be used > > if the same physical clock has multiple outputs. > > > > At present I am actually describing the clock hardware in DT. Each > clock is a node (not a device) using the established clock binding in > Documentation/devicetree/bindings/clocks/clock-bindings.txt. > > To do this I am introducing new bindings for the common types: gate, mux > & divider. These are the ones I am migrating to DT first. Eventually > I'll create bindings for the OMAP-specifc clocks after this. Great, that's the way to go. > I currently have this DT approach co-existing with the static data. As > a start I have used the fixed-clock and mux-clock bindings to put all of > the root clocks and sys_clk into arch/arm/boot/dts/omap4-clocks.dtsi. > This file is included by arch/arm/boot/dts/omap4.dtsi. OK. > The DT clocks are parsed prior to the static clock registration: > > diff --git a/arch/arm/mach-omap2/cclock44xx_data.c b/arch/arm/mach-omap2/cclock44xx_data.c > index 88e37a4..7cc4cae 100644 > --- a/arch/arm/mach-omap2/cclock44xx_data.c > +++ b/arch/arm/mach-omap2/cclock44xx_data.c > @@ -27,6 +27,7 @@ > #include <linux/clk-private.h> > #include <linux/clkdev.h> > #include <linux/io.h> > +#include <linux/clk/omap.h> > > #include "soc.h" > #include "iomap.h" > @@ -1442,27 +1443,11 @@ static struct omap_clk omap443x_clks[] = { > * clocks common to omap44xx > */ > static struct omap_clk omap44xx_clks[] = { > - CLK(NULL, "extalt_clkin_ck", &extalt_clkin_ck), > CLK(NULL, "pad_clks_src_ck", &pad_clks_src_ck), > CLK(NULL, "pad_clks_ck", &pad_clks_ck), > - CLK(NULL, "pad_slimbus_core_clks_ck", &pad_slimbus_core_clks_ck), > - CLK(NULL, "secure_32k_clk_src_ck", &secure_32k_clk_src_ck), > CLK(NULL, "slimbus_src_clk", &slimbus_src_clk), > CLK(NULL, "slimbus_clk", &slimbus_clk), > CLK(NULL, "sys_32k_ck", &sys_32k_ck), > - CLK(NULL, "virt_12000000_ck", &virt_12000000_ck), > - CLK(NULL, "virt_13000000_ck", &virt_13000000_ck), > - CLK(NULL, "virt_16800000_ck", &virt_16800000_ck), > - CLK(NULL, "virt_19200000_ck", &virt_19200000_ck), > - CLK(NULL, "virt_26000000_ck", &virt_26000000_ck), > - CLK(NULL, "virt_27000000_ck", &virt_27000000_ck), > - CLK(NULL, "virt_38400000_ck", &virt_38400000_ck), > - CLK(NULL, "sys_clkin_ck", &sys_clkin_ck), > - CLK(NULL, "tie_low_clock_ck", &tie_low_clock_ck), > - CLK(NULL, "utmi_phy_clkout_ck", &utmi_phy_clkout_ck), > - CLK(NULL, "xclk60mhsp1_ck", &xclk60mhsp1_ck), > - CLK(NULL, "xclk60mhsp2_ck", &xclk60mhsp2_ck), > - CLK(NULL, "xclk60motg_ck", &xclk60motg_ck), > CLK(NULL, "abe_dpll_bypass_clk_mux_ck", &abe_dpll_bypass_clk_mux_ck), > CLK(NULL, "abe_dpll_refclk_mux_ck", &abe_dpll_refclk_mux_ck), > CLK(NULL, "dpll_abe_ck", &dpll_abe_ck), > @@ -1690,6 +1675,9 @@ int __init omap4xxx_clk_init(void) > { > int rc; > > + /* FIXME register clocks from DT first */ > + dt_omap_clk_init(); > + > if (cpu_is_omap443x()) { > cpu_mask = RATE_IN_4430; > omap_clocks_register(omap443x_clks, ARRAY_SIZE(omap443x_clks)); > > > Ideally dt_omap_clk_init() will go away and instead by replaced by the > probe from drivers/clk/omap/clk.c (new omap clock driver). However I > still need to register the root clocks before the PLLs and other > dividers for now to avoid many issues (divide by zero errors, failed > reparent operations, etc). And furthermore I don't think the hwmod code > will work if the clock tree is not populated before module_init. So for > now the omap clock driver does not properly probe or call module_init, > but some day that might be fixed. Yes, I'm sure there are some dependencies to untangle there.. > I know that putting all of the data into DT is not a popular idea with > everybody. I also know that I am not a DT expert, so I'm sure there are > some better approaches to the some of the decisions I'm making. I'll > post an RFC to the list next week with cleaned-up patches and then we > can all take it from there. The DT related bloat issues can be avoided with the following: 1. Allow defining all clocks as needed in the .dtsi files This way we have the clocks available for timer, uart, mmc and whatever people might need. 2. Optionally allow loading the complete clock set from /lib/firmware This way we can avoid large amount of data in the .dtsi files to make booting faster. Naturally this is optional, and not needed if all the clocks are already defined in .dtsi files. And this can of course done later on if needed as long as we just keep that option open. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/clock/omap-clock.txt b/Documentation/devicetree/bindings/clock/omap-clock.txt new file mode 100644 index 0000000..047c1e7 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/omap-clock.txt @@ -0,0 +1,40 @@ +Device Tree Clock bindings for Texas Instrument's OMAP compatible platforms + +This binding is an initial minimal binding that may be enhanced as part of +transitioning OMAP clock data out of kernel image. + +This binding uses the common clock binding[1]. + +[1] Documentation/devicetree/bindings/clock/clock-bindings.txt + +Required properties: +- compatible : shall be "ti,omap-clock" +- #clock-cells : from common clock binding; shall be set to 0. +NOTE: +node name should map to clock database in arch/arm/mach-omap2/cclock<SoC>_data.c +Since all clocks are described with _ck, the node name is optimized to drop the +usage of _ck. For example, a clock called dpll1_ck will be defined as dpll1. + +Example #1: describing clock node for CPU on OMAP34xx platform: +Ref: arch/arm/mach-omap2/cclock3xxx_data.c +describes the CPU clock to be as follows + CLK(NULL, "dpll1_ck", &dpll1_ck, CK_3XXX), +Corresponding binding will be: + dpll1: dpll1 { + #clock-cells = <0>; + compatible = "ti,omap-clock"; + }; +And it's usage will be: + clocks = <&dpll1>; + +Example #2: describing clock node for auxilary clock #3 on OMAP443x platform: +Ref: arch/arm/mach-omap2/cclock44xx_data.c +describes the auxclk3 clock to be as follows: + CLK(NULL, "auxclk3_ck", &auxclk3_ck, CK_443X), +Corresponding binding will be: + auxclk3: auxclk3 { + #clock-cells = <0>; + compatible = "ti,omap-clock"; + }; +And it's usage will be: + clocks = <&auxclk3>; diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 137d3e7..1d5a2ec 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o obj-$(CONFIG_ARCH_ZYNQ) += clk-zynq.o obj-$(CONFIG_ARCH_TEGRA) += tegra/ obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ +obj-$(CONFIG_ARCH_OMAP) += omap/ obj-$(CONFIG_X86) += x86/ diff --git a/drivers/clk/omap/Makefile b/drivers/clk/omap/Makefile new file mode 100644 index 0000000..8195931 --- /dev/null +++ b/drivers/clk/omap/Makefile @@ -0,0 +1 @@ +obj-y += clk.o diff --git a/drivers/clk/omap/clk.c b/drivers/clk/omap/clk.c new file mode 100644 index 0000000..5a3c6d9 --- /dev/null +++ b/drivers/clk/omap/clk.c @@ -0,0 +1,91 @@ +/* + * Texas Instruments OMAP Clock driver + * + * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ + * Nishanth Menon <nm@ti.com> + * Tony Lindgren <tony@atomide.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/clkdev.h> +#include <linux/clk-provider.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/string.h> + +static const struct of_device_id omap_clk_of_match[] = { + {.compatible = "ti,omap-clock",}, + {}, +}; + +/** + * omap_clk_src_get() - Get OMAP clock from node name when needed + * @clkspec: clkspec argument + * @data: unused + * + * REVISIT: We assume the following: + * 1. omap clock names end with _ck + * 2. omap clock names are under 32 characters in length + */ +static struct clk *omap_clk_src_get(struct of_phandle_args *clkspec, void *data) +{ + struct clk *clk; + char clk_name[32]; + struct device_node *np = clkspec->np; + + snprintf(clk_name, 32, "%s_ck", np->name); + clk = clk_get(NULL, clk_name); + if (IS_ERR(clk)) + pr_err("%s: could not get clock %s(%ld)\n", __func__, + clk_name, PTR_ERR(clk)); + + return clk; +} + +/** + * omap_clk_probe() - create link from DT definition to clock data + * @pdev: device node + * + * NOTE: we look up the clock lazily when the consumer driver does + * of_clk_get() and initialize a NULL clock here. + */ +static int omap_clk_probe(struct platform_device *pdev) +{ + int res; + struct device_node *np = pdev->dev.of_node; + + /* This allows the driver to of_clk_get() */ + res = of_clk_add_provider(np, omap_clk_src_get, NULL); + if (res) + dev_err(&pdev->dev, "could not add provider(%d)\n", res); + + return res; +} + +static struct platform_driver omap_clk_driver = { + .probe = omap_clk_probe, + .driver = { + .name = "omap_clk", + .of_match_table = of_match_ptr(omap_clk_of_match), + }, +}; + +static int __init omap_clk_init(void) +{ + return platform_driver_register(&omap_clk_driver); +} +arch_initcall(omap_clk_init); + +MODULE_DESCRIPTION("OMAP Clock driver"); +MODULE_AUTHOR("Texas Instruments Inc."); +MODULE_LICENSE("GPL v2");