All of lore.kernel.org
 help / color / mirror / Atom feed
From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/7] dt/clock: add function to get parent clock name
Date: Tue, 13 Mar 2012 18:22:26 -0500	[thread overview]
Message-ID: <1331680947-29861-7-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1331680947-29861-1-git-send-email-robherring2@gmail.com>

From: Rob Herring <rob.herring@calxeda.com>

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
 drivers/of/clock.c     |   24 ++++++++++++++++++++++++
 include/linux/of_clk.h |    2 ++
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/drivers/of/clock.c b/drivers/of/clock.c
index f4a0965..8ad2dbd 100644
--- a/drivers/of/clock.c
+++ b/drivers/of/clock.c
@@ -128,6 +128,30 @@ struct clk *of_clk_get(struct device_node *np, int index)
 	return clk;
 }
 
+const char *of_clk_get_parent_name(struct device_node *np, int index)
+{
+	struct of_phandle_args clkspec;
+	const char *clk_name;
+	int rc;
+
+	if (index < 0)
+		return NULL;
+
+	rc = of_parse_phandle_with_args(np, "clocks", "#clock-cells", index,
+					&clkspec);
+	if (rc)
+		return NULL;
+
+	if (of_property_read_string_index(clkspec.np, "clock-output-names",
+					  clkspec.args_count ? clkspec.args[0] : 0,
+					  &clk_name) < 0)
+		clk_name = clkspec.np->name;
+
+	of_node_put(clkspec.np);
+	return clk_name;
+}
+
+
 /**
  * of_clk_get_by_name() - Parse and lookup a clock referenced by a device node
  * @np: pointer to clock consumer node
diff --git a/include/linux/of_clk.h b/include/linux/of_clk.h
index 02ecc98..6a07071 100644
--- a/include/linux/of_clk.h
+++ b/include/linux/of_clk.h
@@ -22,6 +22,8 @@ void of_clk_del_provider(struct device_node *np);
 struct clk *of_clk_get(struct device_node *np, int index);
 struct clk *of_clk_get_by_name(struct device_node *np, const char *name);
 
+const char *of_clk_get_parent_name(struct device_node *np, int index);
+
 void of_clk_init(const struct of_device_id *matches);
 extern void of_fixed_clk_setup(struct device_node *np);
 
-- 
1.7.5.4

WARNING: multiple messages have this Message-ID (diff)
From: Rob Herring <robherring2@gmail.com>
To: linux-arm-kernel@lists.infradead.org,
	devicetree-discuss@lists.ozlabs.org
Cc: Grant Likely <grant.likely@secretlab.ca>,
	Mike Turquette <mturquette@linaro.org>,
	Rob Herring <rob.herring@calxeda.com>
Subject: [PATCH 6/7] dt/clock: add function to get parent clock name
Date: Tue, 13 Mar 2012 18:22:26 -0500	[thread overview]
Message-ID: <1331680947-29861-7-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1331680947-29861-1-git-send-email-robherring2@gmail.com>

From: Rob Herring <rob.herring@calxeda.com>

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
 drivers/of/clock.c     |   24 ++++++++++++++++++++++++
 include/linux/of_clk.h |    2 ++
 2 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/drivers/of/clock.c b/drivers/of/clock.c
index f4a0965..8ad2dbd 100644
--- a/drivers/of/clock.c
+++ b/drivers/of/clock.c
@@ -128,6 +128,30 @@ struct clk *of_clk_get(struct device_node *np, int index)
 	return clk;
 }
 
+const char *of_clk_get_parent_name(struct device_node *np, int index)
+{
+	struct of_phandle_args clkspec;
+	const char *clk_name;
+	int rc;
+
+	if (index < 0)
+		return NULL;
+
+	rc = of_parse_phandle_with_args(np, "clocks", "#clock-cells", index,
+					&clkspec);
+	if (rc)
+		return NULL;
+
+	if (of_property_read_string_index(clkspec.np, "clock-output-names",
+					  clkspec.args_count ? clkspec.args[0] : 0,
+					  &clk_name) < 0)
+		clk_name = clkspec.np->name;
+
+	of_node_put(clkspec.np);
+	return clk_name;
+}
+
+
 /**
  * of_clk_get_by_name() - Parse and lookup a clock referenced by a device node
  * @np: pointer to clock consumer node
diff --git a/include/linux/of_clk.h b/include/linux/of_clk.h
index 02ecc98..6a07071 100644
--- a/include/linux/of_clk.h
+++ b/include/linux/of_clk.h
@@ -22,6 +22,8 @@ void of_clk_del_provider(struct device_node *np);
 struct clk *of_clk_get(struct device_node *np, int index);
 struct clk *of_clk_get_by_name(struct device_node *np, const char *name);
 
+const char *of_clk_get_parent_name(struct device_node *np, int index);
+
 void of_clk_init(const struct of_device_id *matches);
 extern void of_fixed_clk_setup(struct device_node *np);
 
-- 
1.7.5.4

  parent reply	other threads:[~2012-03-13 23:22 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-13 23:22 [PATCH 0/7] Highbank clock support using DT Rob Herring
2012-03-13 23:22 ` Rob Herring
2012-03-13 23:22 ` [PATCH 1/7] clk: fix orphan list iterator to be safe Rob Herring
2012-03-13 23:22   ` Rob Herring
2012-03-14  2:10   ` Turquette, Mike
2012-03-14  2:10     ` Turquette, Mike
2012-03-13 23:22 ` [PATCH 2/7] of: add clock providers Rob Herring
2012-03-13 23:22   ` Rob Herring
2012-03-14  7:07   ` Thierry Reding
2012-03-14  7:07     ` Thierry Reding
2012-03-14  7:55   ` Shawn Guo
2012-03-14  7:55     ` Shawn Guo
2012-04-07  4:18   ` Grant Likely
2012-04-07  4:18     ` Grant Likely
2012-04-07 19:04     ` Rob Herring
2012-04-07 19:04       ` Rob Herring
2012-04-09 11:55   ` Shawn Guo
2012-04-09 11:55     ` Shawn Guo
2012-04-09 13:52     ` Rob Herring
2012-04-09 13:52       ` Rob Herring
2012-04-09 14:13       ` Shawn Guo
2012-04-09 14:13         ` Shawn Guo
2012-04-09 14:34         ` Rob Herring
2012-04-09 14:34           ` Rob Herring
2012-04-09 23:42           ` Shawn Guo
2012-04-09 23:42             ` Shawn Guo
2012-03-13 23:22 ` [PATCH 3/7] of: Add of_property_match_string() to find index into a string list Rob Herring
2012-03-13 23:22   ` Rob Herring
2012-04-07  4:22   ` Grant Likely
2012-04-07  4:22     ` Grant Likely
2012-03-13 23:22 ` [PATCH 4/7] dt/clock: Add handling for fixed clocks and a clock node setup iterator Rob Herring
2012-03-13 23:22   ` Rob Herring
2012-03-14  7:59   ` Shawn Guo
2012-03-14  7:59     ` Shawn Guo
2012-03-14 13:26     ` Rob Herring
2012-03-14 13:26       ` Rob Herring
2012-03-14 13:45       ` Shawn Guo
2012-03-14 13:45         ` Shawn Guo
2012-04-08 14:48     ` Rob Herring
2012-04-08 14:48       ` Rob Herring
2012-04-09  8:49       ` Shawn Guo
2012-04-09  8:49         ` Shawn Guo
2012-04-09 14:18         ` Rob Herring
2012-04-09 14:18           ` Rob Herring
2012-04-09 23:27           ` Shawn Guo
2012-04-09 23:27             ` Shawn Guo
2012-04-15  3:04             ` Rob Herring
2012-04-15  3:04               ` Rob Herring
2012-04-15  7:01               ` Shawn Guo
2012-04-15  7:01                 ` Shawn Guo
2012-03-13 23:22 ` [PATCH 5/7] dt/clock: add a simple provider get function Rob Herring
2012-03-13 23:22   ` Rob Herring
2012-04-07  4:26   ` Grant Likely
2012-04-07  4:26     ` Grant Likely
2012-03-13 23:22 ` Rob Herring [this message]
2012-03-13 23:22   ` [PATCH 6/7] dt/clock: add function to get parent clock name Rob Herring
2012-03-13 23:22 ` [PATCH 7/7] clk: add highbank clock support Rob Herring
2012-03-13 23:22   ` Rob Herring
2012-04-10  2:06   ` Shawn Guo
2012-04-10  2:06     ` Shawn Guo
2012-04-10 13:17     ` Rob Herring
2012-04-10 13:17       ` Rob Herring

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=1331680947-29861-7-git-send-email-robherring2@gmail.com \
    --to=robherring2@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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 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.