From: Tero Kristo <t-kristo@ti.com>
To: linux-omap@vger.kernel.org, paul@pwsan.com, tony@atomide.com,
rnayak@ti.com, nm@ti.com, mturquette@linaro.org
Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org
Subject: [PATCHv6 18/45] CLK: DT: add support for set-rate-parent flag
Date: Thu, 29 Aug 2013 16:16:10 +0300 [thread overview]
Message-ID: <1377782197-10611-19-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1377782197-10611-1-git-send-email-t-kristo@ti.com>
Adding set-rate-parent to clock node now allows a node to forward
clk_set_rate request to its parent clock.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
drivers/clk/clk-divider.c | 6 +++++-
drivers/clk/clk-fixed-factor.c | 6 +++++-
drivers/clk/clk-gate.c | 8 ++++++--
drivers/clk/clk-mux.c | 6 +++++-
4 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 724f579..353fd5a 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -388,6 +388,7 @@ void of_divider_clk_setup(struct device_node *node)
u32 mask = 0;
u32 shift = 0;
struct clk_div_table *table;
+ u32 flags = 0;
of_property_read_string(node, "clock-output-names", &clk_name);
@@ -422,11 +423,14 @@ void of_divider_clk_setup(struct device_node *node)
if (of_property_read_bool(node, "hiword-mask"))
clk_divider_flags |= CLK_DIVIDER_HIWORD_MASK;
+ if (of_property_read_bool(node, "set-rate-parent"))
+ flags |= CLK_SET_RATE_PARENT;
+
table = of_clk_get_div_table(node);
if (IS_ERR(table))
return;
- clk = _register_divider(NULL, clk_name, parent_name, 0, reg, shift,
+ clk = _register_divider(NULL, clk_name, parent_name, flags, reg, shift,
mask, clk_divider_flags, table, NULL);
if (!IS_ERR(clk))
diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
index 9ff7d51..30aa121 100644
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@ -107,6 +107,7 @@ void __init of_fixed_factor_clk_setup(struct device_node *node)
const char *clk_name = node->name;
const char *parent_name;
u32 div, mult;
+ u32 flags = 0;
if (of_property_read_u32(node, "clock-div", &div)) {
pr_err("%s Fixed factor clock <%s> must have a clock-div property\n",
@@ -123,7 +124,10 @@ void __init of_fixed_factor_clk_setup(struct device_node *node)
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,
+ if (of_property_read_bool(node, "set-rate-parent"))
+ flags |= CLK_SET_RATE_PARENT;
+
+ clk = clk_register_fixed_factor(NULL, clk_name, parent_name, flags,
mult, div);
if (!IS_ERR(clk))
of_clk_add_provider(node, of_clk_src_simple_get, clk);
diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c
index 7ba3633..4a1360a 100644
--- a/drivers/clk/clk-gate.c
+++ b/drivers/clk/clk-gate.c
@@ -176,6 +176,7 @@ void of_gate_clk_setup(struct device_node *node)
const char *parent_name;
u8 clk_gate_flags = 0;
u32 bit_idx = 0;
+ u32 flags = 0;
of_property_read_string(node, "clock-output-names", &clk_name);
@@ -199,8 +200,11 @@ void of_gate_clk_setup(struct device_node *node)
if (of_property_read_bool(node, "hiword-mask"))
clk_gate_flags |= CLK_GATE_HIWORD_MASK;
- clk = clk_register_gate(NULL, clk_name, parent_name, 0, reg, bit_idx,
- clk_gate_flags, NULL);
+ if (of_property_read_bool(node, "set-rate-parent"))
+ flags |= CLK_SET_RATE_PARENT;
+
+ clk = clk_register_gate(NULL, clk_name, parent_name, flags, reg,
+ bit_idx, clk_gate_flags, NULL);
if (!IS_ERR(clk))
of_clk_add_provider(node, of_clk_src_simple_get, clk);
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
index cb68226..87a70d4 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
@@ -184,6 +184,7 @@ void of_mux_clk_setup(struct device_node *node)
u8 clk_mux_flags = 0;
u32 mask = 0;
u32 shift = 0;
+ u32 flags = 0;
of_property_read_string(node, "clock-output-names", &clk_name);
@@ -223,8 +224,11 @@ void of_mux_clk_setup(struct device_node *node)
if (of_property_read_bool(node, "hiword-mask"))
clk_mux_flags |= CLK_MUX_HIWORD_MASK;
+ if (of_property_read_bool(node, "set-rate-parent"))
+ flags |= CLK_SET_RATE_PARENT;
+
clk = clk_register_mux_table(NULL, clk_name, parent_names, num_parents,
- 0, reg, shift, mask, clk_mux_flags, NULL, NULL);
+ flags, reg, shift, mask, clk_mux_flags, NULL, NULL);
if (!IS_ERR(clk))
of_clk_add_provider(node, of_clk_src_simple_get, clk);
--
1.7.9.5
next prev parent reply other threads:[~2013-08-29 13:16 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-29 13:15 [PATCHv6 00/45] OMAP CCF DT conversion Tero Kristo
2013-08-29 13:15 ` [PATCHv6 01/45] CLK: TI: Add DPLL clock support Tero Kristo
2013-09-10 22:09 ` Mike Turquette
[not found] ` <1377782197-10611-2-git-send-email-t-kristo-l0cyMroinI0@public.gmane.org>
2013-09-17 16:09 ` Tony Lindgren
2013-08-29 13:15 ` [PATCHv6 02/45] CLK: TI: add DT alias clock registration mechanism Tero Kristo
2013-08-29 13:15 ` [PATCHv6 03/45] CLK: TI: add autoidle support Tero Kristo
2013-08-29 13:15 ` [PATCHv6 04/45] CLK: TI: add support for OMAP gate clock Tero Kristo
2013-08-29 13:15 ` [PATCHv6 05/45] CLK: TI: add support for clockdomain binding Tero Kristo
2013-08-29 13:15 ` [PATCHv6 06/45] ARM: dts: omap4 clock data Tero Kristo
2013-08-29 13:15 ` [PATCHv6 07/45] CLK: TI: add omap4 clock init file Tero Kristo
2013-08-29 13:16 ` [PATCHv6 08/45] ARM: OMAP4: remove old clock data and link in new clock init code Tero Kristo
2013-08-29 13:16 ` [PATCHv6 09/45] ARM: dts: omap5 clock data Tero Kristo
2013-08-29 13:16 ` [PATCHv6 10/45] CLK: TI: add omap5 clock init file Tero Kristo
2013-08-29 13:16 ` [PATCHv6 11/45] CLK: TI: omap5: Initialize USB_DPLL at boot Tero Kristo
2013-08-29 13:16 ` [PATCHv6 12/45] ARM: dts: dra7 clock data Tero Kristo
2013-08-29 13:16 ` [PATCHv6 13/45] ARM: dts: clk: Add apll related clocks Tero Kristo
2013-08-29 13:16 ` [PATCHv6 14/45] ARM: dts: DRA7: Change apll_pcie_m2_ck to fixed factor clock Tero Kristo
2013-08-29 13:16 ` [PATCHv6 15/45] ARM: dts: DRA7: Add PCIe related clock nodes Tero Kristo
2013-08-29 13:16 ` [PATCHv6 16/45] CLK: TI: DRA7: Add APLL support Tero Kristo
2013-08-29 13:16 ` [PATCHv6 17/45] CLK: TI: add dra7 clock init file Tero Kristo
2013-08-29 13:16 ` Tero Kristo [this message]
2013-08-29 13:16 ` [PATCHv6 19/45] ARM: dts: am33xx clock data Tero Kristo
2013-08-29 13:16 ` [PATCHv6 20/45] CLK: TI: add am33xx clock init file Tero Kristo
2013-08-29 13:16 ` [PATCHv6 21/45] ARM: AM33xx: remove old clock data and link in new clock init code Tero Kristo
2013-08-29 13:16 ` [PATCHv6 22/45] CLK: TI: add interface clock support for OMAP3 Tero Kristo
2013-08-29 13:16 ` [PATCHv6 23/45] ARM: OMAP: hwmod: fix an incorrect clk type cast with _get_clkdm Tero Kristo
2013-08-29 13:16 ` [PATCHv6 24/45] ARM: OMAP3: hwmod: initialize clkdm from clkdm_name Tero Kristo
2013-08-29 13:16 ` [PATCHv6 25/45] ARM: dts: omap3 clock data Tero Kristo
2013-08-29 13:16 ` [PATCHv6 26/45] CLK: TI: add omap3 clock init file Tero Kristo
2013-08-29 13:16 ` [PATCHv6 27/45] ARM: dts: AM35xx clock data Tero Kristo
2013-08-29 13:16 ` [PATCHv6 28/45] ARM: dts: AM35xx: use DT " Tero Kristo
2013-08-29 13:16 ` [PATCHv6 29/45] ARM: OMAP3: use DT clock init if DT data is available Tero Kristo
2013-08-29 13:16 ` [PATCHv6 30/45] ARM: dts: am43xx clock data Tero Kristo
2013-08-29 13:16 ` [PATCHv6 31/45] ARM: OMAP2+: Add support to parse 'main_clk' info from DT Tero Kristo
2013-08-29 13:16 ` [PATCHv6 32/45] ARM: OMAP2+: Add support to parse optional clk " Tero Kristo
2013-08-29 13:16 ` [PATCHv6 33/45] ARM: OMAP2+: hwmod: fix opt_clk handling with DT Tero Kristo
2013-08-29 13:16 ` [PATCHv6 34/45] ARM: OMAP2+: timer: fix boot crash with DT only boot and DT clocks Tero Kristo
2013-08-29 13:16 ` [PATCHv6 35/45] ARM: OMAP4: dts: Add main and optional clock data into DT Tero Kristo
2013-08-29 13:16 ` [PATCHv6 36/45] ARM: dts: omap3: " Tero Kristo
2013-08-29 13:16 ` [PATCHv6 37/45] ARM: OMAP3: hwmod_data: remove main and optional clock info from hwmod Tero Kristo
2013-08-29 13:16 ` [PATCHv6 38/45] ARM: OMAP2+: omap_device: use dev pointer to optimize code Tero Kristo
2013-08-29 13:16 ` [PATCHv6 39/45] ARM: OMAP2+: omap_device: no need to add a clock dev for aliases Tero Kristo
2013-08-29 13:16 ` [PATCHv6 40/45] ARM: OMAP2+: omap_device: use dt aware clk_get to lookup clk Tero Kristo
2013-08-29 13:16 ` [PATCHv6 41/45] ARM: dts: omap5: Add main and optional clock data into DT Tero Kristo
2013-08-29 13:16 ` [PATCHv6 42/45] ARM: dts: am335x: " Tero Kristo
2013-08-29 13:16 ` [PATCHv6 43/45] ARM: dts: DRA7: link in clock DT data Tero Kristo
2013-08-29 13:16 ` [PATCHv6 44/45] ARM: OMAP: DRA7: Enable clock init Tero Kristo
2013-08-29 13:16 ` [PATCHv6 45/45] ARM: dts: dra7: Add main and optional clock data into DT Tero Kristo
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=1377782197-10611-19-git-send-email-t-kristo@ti.com \
--to=t-kristo@ti.com \
--cc=devicetree@vger.kernel.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: link
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;
as well as URLs for NNTP newsgroup(s).