linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: ben.dooks@codethink.co.uk (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices
Date: Fri,  7 Mar 2014 12:46:39 +0000	[thread overview]
Message-ID: <1394196400-17112-2-git-send-email-ben.dooks@codethink.co.uk> (raw)
In-Reply-To: <1394196400-17112-1-git-send-email-ben.dooks@codethink.co.uk>

With the addition of clock-indices, we need to change the renesas
clock implementation to use these instead of the local definition.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
 Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt | 2 +-
 drivers/clk/shmobile/clk-mstp.c                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
index 5992dce..02a25d9 100644
--- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
@@ -43,7 +43,7 @@ Example
 		clock-output-names =
 			"tpu0", "mmcif1", "sdhi3", "sdhi2",
 			 "sdhi1", "sdhi0", "mmcif0";
-		renesas,clock-indices = <
+		clock-indices = <
 			R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3
 			R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0
 			R8A7790_CLK_MMCIF0
diff --git a/drivers/clk/shmobile/clk-mstp.c b/drivers/clk/shmobile/clk-mstp.c
index 42d5912..95a2aa7 100644
--- a/drivers/clk/shmobile/clk-mstp.c
+++ b/drivers/clk/shmobile/clk-mstp.c
@@ -197,7 +197,7 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
 			continue;
 
 		parent_name = of_clk_get_parent_name(np, i);
-		ret = of_property_read_u32_index(np, "renesas,clock-indices", i,
+		ret = of_property_read_u32_index(np, "clock-indices", i,
 						 &clkidx);
 		if (parent_name == NULL || ret < 0)
 			break;
-- 
1.9.0

  reply	other threads:[~2014-03-07 12:46 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-07 12:46 Renesas clock clk-mstp updates for clock-indices Ben Dooks
2014-03-07 12:46 ` Ben Dooks [this message]
2014-03-11  5:16   ` [PATCH 1/2] clk: shmobile: clk-mstp: change to using clock-indices Simon Horman
2014-03-11 11:07     ` Ben Dooks
2014-03-11 22:39       ` Simon Horman
2014-03-07 12:46 ` [PATCH 2/2] clk: shmobile: clk-mstp: add backwards comapt for indices field Ben Dooks
2014-03-07 17:26   ` Laurent Pinchart
2014-03-10 10:51   ` Mark Rutland
2014-03-10 11:10     ` Ben Dooks
2014-04-15  9:10   ` Geert Uytterhoeven
2014-04-10  2:39 ` Renesas clock clk-mstp updates for clock-indices Kuninori Morimoto
2014-04-15  9:26 ` Geert Uytterhoeven
2014-04-15 11:43   ` Ben Dooks
2014-04-15 11:46     ` Geert Uytterhoeven
2014-04-15 11:52       ` Ben Dooks
2014-04-15 12:24         ` Geert Uytterhoeven
2014-04-15 23:59         ` Simon Horman
2014-04-15 23:58   ` Simon Horman
2014-04-16  7:12     ` Geert Uytterhoeven
2014-04-16  7:52       ` Simon Horman

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=1394196400-17112-2-git-send-email-ben.dooks@codethink.co.uk \
    --to=ben.dooks@codethink.co.uk \
    --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 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).