From: Tero Kristo <t-kristo@ti.com> To: linux-omap@vger.kernel.org, paul@pwsan.com, khilman@linaro.org, tony@atomide.com, mturquette@linaro.org, nm@ti.com, rnayak@ti.com Cc: linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org Subject: [PATCHv4 05/33] CLK: omap: add DT duplicate clock registration mechanism Date: Tue, 23 Jul 2013 10:20:00 +0300 [thread overview] Message-ID: <1374564028-11352-6-git-send-email-t-kristo@ti.com> (raw) In-Reply-To: <1374564028-11352-1-git-send-email-t-kristo@ti.com> Some devices require their clocks to be available with a specific dev-id con-id mapping. With DT, the clocks can be found by default only with their name, or alternatively through the device node of the consumer. With drivers, that don't support DT fully yet, add mechanism to register specific clock names. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- drivers/clk/omap/clk.c | 39 +++++++++++++++++++++++++++++++++++++++ include/linux/clk/omap.h | 17 +++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/drivers/clk/omap/clk.c b/drivers/clk/omap/clk.c index 1dafdaa..cd31a81 100644 --- a/drivers/clk/omap/clk.c +++ b/drivers/clk/omap/clk.c @@ -32,6 +32,45 @@ static const struct of_device_id clk_match[] = { {}, }; + /** + * omap_dt_clocks_register - register DT duplicate clocks during boot + * @oclks: list of clocks to register + * @cnt: number of clocks + * + * Register duplicate or non-standard DT clock entries during boot. By + * default, DT clocks are found based on their node name. If any + * additional con-id / dev-id -> clock mapping is required, use this + * function to list these. + */ +void __init omap_dt_clocks_register(struct omap_dt_clk oclks[], int cnt) +{ + struct omap_dt_clk *c; + struct device_node *n; + struct clk *clk; + struct of_phandle_args clkspec; + + for (c = oclks; c < oclks + cnt; c++) { + n = of_find_node_by_name(NULL, c->node_name); + + if (!n) { + pr_err("%s: %s not found!\n", __func__, c->node_name); + continue; + } + + clkspec.np = n; + + clk = of_clk_get_from_provider(&clkspec); + + if (!clk) { + pr_err("%s: %s has no clock!\n", __func__, + c->node_name); + continue; + } + c->lk.clk = clk; + clkdev_add(&c->lk); + } +} + /* FIXME - need to initialize early; skip real driver registration & probe */ int __init dt_omap_clk_init(void) { diff --git a/include/linux/clk/omap.h b/include/linux/clk/omap.h index cba892a..c39e775 100644 --- a/include/linux/clk/omap.h +++ b/include/linux/clk/omap.h @@ -19,6 +19,8 @@ #ifndef __LINUX_CLK_OMAP_H_ #define __LINUX_CLK_OMAP_H_ +#include <linux/clkdev.h> + /** * struct dpll_data - DPLL registers and integration data * @mult_div1_reg: register containing the DPLL M and N bitfields @@ -146,6 +148,20 @@ struct clk_hw_omap_ops { void (*deny_idle)(struct clk_hw_omap *oclk); }; +struct omap_dt_clk { + struct clk_lookup lk; + const char *node_name; +}; + +#define DT_CLK(dev, con, name) \ + { \ + .lk = { \ + .dev_id = dev, \ + .con_id = con, \ + }, \ + .node_name = name, \ + } + void omap2_init_clk_hw_omap_clocks(struct clk *clk); int omap3_noncore_dpll_enable(struct clk_hw *hw); void omap3_noncore_dpll_disable(struct clk_hw *hw); @@ -174,6 +190,7 @@ extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx; /* DT functions */ 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); #endif -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: t-kristo@ti.com (Tero Kristo) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv4 05/33] CLK: omap: add DT duplicate clock registration mechanism Date: Tue, 23 Jul 2013 10:20:00 +0300 [thread overview] Message-ID: <1374564028-11352-6-git-send-email-t-kristo@ti.com> (raw) In-Reply-To: <1374564028-11352-1-git-send-email-t-kristo@ti.com> Some devices require their clocks to be available with a specific dev-id con-id mapping. With DT, the clocks can be found by default only with their name, or alternatively through the device node of the consumer. With drivers, that don't support DT fully yet, add mechanism to register specific clock names. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- drivers/clk/omap/clk.c | 39 +++++++++++++++++++++++++++++++++++++++ include/linux/clk/omap.h | 17 +++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/drivers/clk/omap/clk.c b/drivers/clk/omap/clk.c index 1dafdaa..cd31a81 100644 --- a/drivers/clk/omap/clk.c +++ b/drivers/clk/omap/clk.c @@ -32,6 +32,45 @@ static const struct of_device_id clk_match[] = { {}, }; + /** + * omap_dt_clocks_register - register DT duplicate clocks during boot + * @oclks: list of clocks to register + * @cnt: number of clocks + * + * Register duplicate or non-standard DT clock entries during boot. By + * default, DT clocks are found based on their node name. If any + * additional con-id / dev-id -> clock mapping is required, use this + * function to list these. + */ +void __init omap_dt_clocks_register(struct omap_dt_clk oclks[], int cnt) +{ + struct omap_dt_clk *c; + struct device_node *n; + struct clk *clk; + struct of_phandle_args clkspec; + + for (c = oclks; c < oclks + cnt; c++) { + n = of_find_node_by_name(NULL, c->node_name); + + if (!n) { + pr_err("%s: %s not found!\n", __func__, c->node_name); + continue; + } + + clkspec.np = n; + + clk = of_clk_get_from_provider(&clkspec); + + if (!clk) { + pr_err("%s: %s has no clock!\n", __func__, + c->node_name); + continue; + } + c->lk.clk = clk; + clkdev_add(&c->lk); + } +} + /* FIXME - need to initialize early; skip real driver registration & probe */ int __init dt_omap_clk_init(void) { diff --git a/include/linux/clk/omap.h b/include/linux/clk/omap.h index cba892a..c39e775 100644 --- a/include/linux/clk/omap.h +++ b/include/linux/clk/omap.h @@ -19,6 +19,8 @@ #ifndef __LINUX_CLK_OMAP_H_ #define __LINUX_CLK_OMAP_H_ +#include <linux/clkdev.h> + /** * struct dpll_data - DPLL registers and integration data * @mult_div1_reg: register containing the DPLL M and N bitfields @@ -146,6 +148,20 @@ struct clk_hw_omap_ops { void (*deny_idle)(struct clk_hw_omap *oclk); }; +struct omap_dt_clk { + struct clk_lookup lk; + const char *node_name; +}; + +#define DT_CLK(dev, con, name) \ + { \ + .lk = { \ + .dev_id = dev, \ + .con_id = con, \ + }, \ + .node_name = name, \ + } + void omap2_init_clk_hw_omap_clocks(struct clk *clk); int omap3_noncore_dpll_enable(struct clk_hw *hw); void omap3_noncore_dpll_disable(struct clk_hw *hw); @@ -174,6 +190,7 @@ extern const struct clk_hw_omap_ops clkhwops_omap4_dpllmx; /* DT functions */ 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); #endif -- 1.7.9.5
next prev parent reply other threads:[~2013-07-23 7:20 UTC|newest] Thread overview: 204+ 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 ` Tero Kristo 2013-07-23 7:19 ` [PATCHv4 01/33] CLK: clkdev: add support for looking up clocks from DT Tero Kristo 2013-07-23 7:19 ` Tero Kristo 2013-07-30 15:04 ` Nishanth Menon 2013-07-30 15:04 ` Nishanth Menon 2013-07-31 8:43 ` Tero Kristo 2013-07-31 8:43 ` Tero Kristo 2013-07-23 7:19 ` [PATCHv4 02/33] clk: omap: introduce clock driver Tero Kristo 2013-07-23 7:19 ` Tero Kristo 2013-07-30 15:21 ` Nishanth Menon 2013-07-30 15:21 ` Nishanth Menon 2013-07-31 8:59 ` Tero Kristo 2013-07-31 8:59 ` Tero Kristo 2013-08-01 13:44 ` Nishanth Menon 2013-08-01 13:44 ` Nishanth Menon 2013-08-01 14:59 ` Tero Kristo 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-23 7:19 ` Tero Kristo 2013-07-30 16:23 ` Nishanth Menon 2013-07-30 16:23 ` Nishanth Menon 2013-07-31 9:46 ` Tero Kristo 2013-07-31 9:46 ` Tero Kristo 2013-08-01 14:00 ` Nishanth Menon 2013-08-01 14:00 ` Nishanth Menon 2013-08-01 15:08 ` Tero Kristo 2013-08-01 15:08 ` Tero Kristo 2013-08-01 15:13 ` Nishanth Menon 2013-08-01 15:13 ` Nishanth Menon 2013-08-01 8:29 ` Rajendra Nayak 2013-08-01 8:29 ` Rajendra Nayak 2013-08-01 15:10 ` Nishanth Menon 2013-08-01 15:10 ` Nishanth Menon 2013-08-01 15:41 ` Tero Kristo 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-23 7:19 ` Tero Kristo 2013-07-30 18:22 ` Nishanth Menon 2013-07-30 18:22 ` Nishanth Menon 2013-07-31 9:59 ` Tero Kristo 2013-07-31 9:59 ` Tero Kristo 2013-08-01 14:04 ` Nishanth Menon 2013-08-01 14:04 ` Nishanth Menon 2013-08-01 15:12 ` Tero Kristo 2013-08-01 15:12 ` Tero Kristo 2013-08-01 15:21 ` Nishanth Menon 2013-08-01 15:21 ` Nishanth Menon 2013-07-23 7:20 ` Tero Kristo [this message] 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-30 18:40 ` Nishanth Menon 2013-07-31 10:07 ` Tero Kristo 2013-07-31 10:07 ` Tero Kristo 2013-08-01 14:25 ` Nishanth Menon 2013-08-01 14:25 ` Nishanth Menon 2013-08-01 15:18 ` Tero Kristo 2013-08-01 15:18 ` Tero Kristo 2013-08-01 15:24 ` Nishanth Menon 2013-08-01 15:24 ` Nishanth Menon 2013-08-01 15:30 ` Tero Kristo 2013-08-01 15:30 ` Tero Kristo 2013-08-02 7:22 ` Tony Lindgren 2013-08-02 7:22 ` Tony Lindgren 2013-07-23 7:20 ` [PATCHv4 06/33] CLK: omap: add autoidle support Tero Kristo 2013-07-23 7:20 ` Tero Kristo 2013-07-30 18:56 ` Nishanth Menon 2013-07-30 18:56 ` Nishanth Menon 2013-07-31 10:13 ` Tero Kristo 2013-07-31 10:13 ` Tero Kristo 2013-08-01 14:11 ` Nishanth Menon 2013-08-01 14:11 ` Nishanth Menon 2013-08-01 15:22 ` Tero Kristo 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-23 7:20 ` Tero Kristo 2013-07-30 19:17 ` Nishanth Menon 2013-07-30 19:17 ` Nishanth Menon 2013-07-31 14:45 ` Tero Kristo 2013-07-31 14:45 ` Tero Kristo 2013-08-01 14:33 ` Nishanth Menon 2013-08-01 14:33 ` Nishanth Menon 2013-08-01 15:29 ` Tero Kristo 2013-08-01 15:29 ` Tero Kristo 2013-07-23 7:20 ` [PATCHv4 08/33] ARM: dts: omap4 clock data Tero Kristo 2013-07-23 7:20 ` Tero Kristo 2013-07-30 19:27 ` Nishanth Menon 2013-07-30 19:27 ` Nishanth Menon 2013-07-31 14:49 ` Tero Kristo 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-23 7:20 ` Tero Kristo 2013-07-30 19:33 ` Nishanth Menon 2013-07-30 19:33 ` Nishanth Menon 2013-07-31 14:52 ` Tero Kristo 2013-07-31 14:52 ` Tero Kristo 2013-08-01 14:40 ` Nishanth Menon 2013-08-01 14:40 ` Nishanth Menon 2013-08-01 15:34 ` Tero Kristo 2013-08-01 15:34 ` Tero Kristo 2013-08-01 16:10 ` Nishanth Menon 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-23 7:20 ` Tero Kristo 2013-07-30 19:42 ` Nishanth Menon 2013-07-30 19:42 ` Nishanth Menon 2013-07-31 14:55 ` Tero Kristo 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 ` Tero Kristo 2013-07-23 7:20 ` [PATCHv4 12/33] CLK: omap: add omap5 clock init file Tero Kristo 2013-07-23 7:20 ` Tero Kristo 2013-07-23 7:20 ` [PATCHv4 13/33] ARM: dts: dra7 clock data Tero Kristo 2013-07-23 7:20 ` Tero Kristo 2013-07-23 7:20 ` [PATCHv4 14/33] CLK: omap: add dra7 clock init file Tero Kristo 2013-07-23 7:20 ` 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-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-30 19:18 ` Nishanth Menon 2013-07-31 14:56 ` Tero Kristo 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-23 7:20 ` Tero Kristo 2013-07-30 19:49 ` Nishanth Menon 2013-07-30 19:49 ` Nishanth Menon 2013-07-31 14:57 ` Tero Kristo 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-23 7:20 ` Tero Kristo 2013-07-30 19:58 ` Nishanth Menon 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 ` Tero Kristo 2013-07-23 7:20 ` [PATCHv4 19/33] CLK: omap: add am33xx clock init file Tero Kristo 2013-07-23 7:20 ` Tero Kristo 2013-07-30 20:00 ` Nishanth Menon 2013-07-30 20:00 ` Nishanth Menon 2013-07-31 14:59 ` Tero Kristo 2013-07-31 14:59 ` Tero Kristo 2013-08-01 14:43 ` Nishanth Menon 2013-08-01 14:43 ` Nishanth Menon 2013-08-01 15:35 ` Tero Kristo 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 ` Tero Kristo 2013-07-23 7:20 ` [PATCHv4 21/33] CLK: OMAP: DPLL: add omap3 dpll support Tero Kristo 2013-07-23 7:20 ` Tero Kristo 2013-07-30 20:08 ` Nishanth Menon 2013-07-30 20:08 ` Nishanth Menon 2013-07-31 15:03 ` Tero Kristo 2013-07-31 15:03 ` Tero Kristo 2013-08-01 14:46 ` Nishanth Menon 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-23 7:20 ` Tero Kristo 2013-07-30 20:13 ` Nishanth Menon 2013-07-30 20:13 ` Nishanth Menon 2013-07-31 15:05 ` Tero Kristo 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-23 7:20 ` Tero Kristo 2013-07-30 20:23 ` Nishanth Menon 2013-07-30 20:23 ` Nishanth Menon 2013-07-31 15:09 ` Tero Kristo 2013-07-31 15:09 ` Tero Kristo 2013-08-01 14:50 ` Nishanth Menon 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 ` 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 ` 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 ` 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 ` Tero Kristo 2013-07-23 7:20 ` [PATCHv4 28/33] ARM: dts: omap3 clock data Tero Kristo 2013-07-23 7:20 ` Tero Kristo 2013-07-23 7:20 ` [PATCHv4 30/33] clk: OMAP: DRA7: Add APLL support Tero Kristo 2013-07-23 7:20 ` Tero Kristo 2013-07-23 7:20 ` [PATCHv4 31/33] ARM: dts: clk: Add apll related clocks Tero Kristo 2013-07-23 7:20 ` 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 ` Tero Kristo 2013-07-23 7:20 ` [PATCHv4 33/33] clk: DTS: DRA7: Add PCIe related clock nodes Tero Kristo 2013-07-23 7:20 ` Tero Kristo 2013-07-23 8:24 ` [PATCHv4 00/33] ARM: OMAP: clock conversion to DT Tero Kristo 2013-07-23 8:24 ` Tero Kristo 2013-07-24 14:16 ` Roger Quadros 2013-07-24 14:16 ` Roger Quadros 2013-07-24 14:29 ` Tero Kristo 2013-07-24 14:29 ` Tero Kristo 2013-07-24 14:34 ` Roger Quadros 2013-07-24 14:34 ` Roger Quadros 2013-07-24 14:43 ` Tero Kristo 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-30 20:19 ` Nishanth Menon 2013-07-31 6:35 ` Tony Lindgren 2013-07-31 6:35 ` Tony Lindgren 2013-07-31 15:10 ` Tero Kristo 2013-07-31 15:10 ` Tero Kristo 2013-08-02 7:24 ` Tony Lindgren 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=1374564028-11352-6-git-send-email-t-kristo@ti.com \ --to=t-kristo@ti.com \ --cc=devicetree-discuss@lists.ozlabs.org \ --cc=khilman@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=mturquette@linaro.org \ --cc=nm@ti.com \ --cc=paul@pwsan.com \ --cc=rnayak@ti.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.