All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/10] ARM: shmobile: sh7372: sh7372_fsidivX_clk become non-global
Date: Fri, 09 Nov 2012 07:29:21 +0000	[thread overview]
Message-ID: <1352446165-19298-7-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1352446165-19298-1-git-send-email-horms@verge.net.au>

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Not only sh7372 but also many Renesas chip has FSI-DIV clock,
and we can share its sh_clk_ops.
To support common FSI-DIV clock, sh7372_fsidivX_clk
becomes non-global by this patch.
This is preparation for FSI DT support.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 arch/arm/mach-shmobile/board-ap4evb.c        |    2 +-
 arch/arm/mach-shmobile/board-mackerel.c      |    2 +-
 arch/arm/mach-shmobile/clock-sh7372.c        |   10 ++++++----
 arch/arm/mach-shmobile/include/mach/sh7372.h |    2 --
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 790dc68..cefdd03 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -728,7 +728,7 @@ fsia_ick_out:
 static int fsi_hdmi_set_rate(struct device *dev, int rate, int enable)
 {
 	struct clk *fsib_clk;
-	struct clk *fdiv_clk = &sh7372_fsidivb_clk;
+	struct clk *fdiv_clk = clk_get(NULL, "fsidivb");
 	long fsib_rate = 0;
 	long fdiv_rate = 0;
 	int ackmd_bpfmd;
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 0c27c81..c826d77 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -882,7 +882,7 @@ static int __fsi_set_round_rate(struct clk *clk, long rate, int enable)
 static int fsi_b_set_rate(struct device *dev, int rate, int enable)
 {
 	struct clk *fsib_clk;
-	struct clk *fdiv_clk = &sh7372_fsidivb_clk;
+	struct clk *fdiv_clk = clk_get(NULL, "fsidivb");
 	long fsib_rate = 0;
 	long fdiv_rate = 0;
 	int ackmd_bpfmd;
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c
index 430a90f..18dcff7 100644
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@ -481,7 +481,7 @@ static struct clk_mapping fsidiva_clk_mapping = {
 	.len	= 8,
 };
 
-struct clk sh7372_fsidiva_clk = {
+static struct clk fsidiva_clk = {
 	.ops		= &fsidiv_clk_ops,
 	.parent		= &div6_reparent_clks[DIV6_FSIA], /* late install */
 	.mapping	= &fsidiva_clk_mapping,
@@ -492,15 +492,15 @@ static struct clk_mapping fsidivb_clk_mapping = {
 	.len	= 8,
 };
 
-struct clk sh7372_fsidivb_clk = {
+static struct clk fsidivb_clk = {
 	.ops		= &fsidiv_clk_ops,
 	.parent		= &div6_reparent_clks[DIV6_FSIB],  /* late install */
 	.mapping	= &fsidivb_clk_mapping,
 };
 
 static struct clk *late_main_clks[] = {
-	&sh7372_fsidiva_clk,
-	&sh7372_fsidivb_clk,
+	&fsidiva_clk,
+	&fsidivb_clk,
 };
 
 enum { MSTP001, MSTP000,
@@ -583,6 +583,8 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_CON_ID("pllc1_clk", &pllc1_clk),
 	CLKDEV_CON_ID("pllc1_div2_clk", &pllc1_div2_clk),
 	CLKDEV_CON_ID("pllc2_clk", &sh7372_pllc2_clk),
+	CLKDEV_CON_ID("fsidiva", &fsidiva_clk),
+	CLKDEV_CON_ID("fsidivb", &fsidivb_clk),
 
 	/* DIV4 clocks */
 	CLKDEV_CON_ID("i_clk", &div4_clks[DIV4_I]),
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index d65fbbe..26cd101 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -479,8 +479,6 @@ extern struct clk sh7372_dv_clki_div2_clk;
 extern struct clk sh7372_pllc2_clk;
 extern struct clk sh7372_fsiack_clk;
 extern struct clk sh7372_fsibck_clk;
-extern struct clk sh7372_fsidiva_clk;
-extern struct clk sh7372_fsidivb_clk;
 
 extern void sh7372_intcs_suspend(void);
 extern void sh7372_intcs_resume(void);
-- 
1.7.10.4


WARNING: multiple messages have this Message-ID (diff)
From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/10] ARM: shmobile: sh7372: sh7372_fsidivX_clk become non-global
Date: Fri,  9 Nov 2012 16:29:21 +0900	[thread overview]
Message-ID: <1352446165-19298-7-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1352446165-19298-1-git-send-email-horms@verge.net.au>

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Not only sh7372 but also many Renesas chip has FSI-DIV clock,
and we can share its sh_clk_ops.
To support common FSI-DIV clock, sh7372_fsidivX_clk
becomes non-global by this patch.
This is preparation for FSI DT support.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 arch/arm/mach-shmobile/board-ap4evb.c        |    2 +-
 arch/arm/mach-shmobile/board-mackerel.c      |    2 +-
 arch/arm/mach-shmobile/clock-sh7372.c        |   10 ++++++----
 arch/arm/mach-shmobile/include/mach/sh7372.h |    2 --
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 790dc68..cefdd03 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -728,7 +728,7 @@ fsia_ick_out:
 static int fsi_hdmi_set_rate(struct device *dev, int rate, int enable)
 {
 	struct clk *fsib_clk;
-	struct clk *fdiv_clk = &sh7372_fsidivb_clk;
+	struct clk *fdiv_clk = clk_get(NULL, "fsidivb");
 	long fsib_rate = 0;
 	long fdiv_rate = 0;
 	int ackmd_bpfmd;
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 0c27c81..c826d77 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -882,7 +882,7 @@ static int __fsi_set_round_rate(struct clk *clk, long rate, int enable)
 static int fsi_b_set_rate(struct device *dev, int rate, int enable)
 {
 	struct clk *fsib_clk;
-	struct clk *fdiv_clk = &sh7372_fsidivb_clk;
+	struct clk *fdiv_clk = clk_get(NULL, "fsidivb");
 	long fsib_rate = 0;
 	long fdiv_rate = 0;
 	int ackmd_bpfmd;
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c
index 430a90f..18dcff7 100644
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@ -481,7 +481,7 @@ static struct clk_mapping fsidiva_clk_mapping = {
 	.len	= 8,
 };
 
-struct clk sh7372_fsidiva_clk = {
+static struct clk fsidiva_clk = {
 	.ops		= &fsidiv_clk_ops,
 	.parent		= &div6_reparent_clks[DIV6_FSIA], /* late install */
 	.mapping	= &fsidiva_clk_mapping,
@@ -492,15 +492,15 @@ static struct clk_mapping fsidivb_clk_mapping = {
 	.len	= 8,
 };
 
-struct clk sh7372_fsidivb_clk = {
+static struct clk fsidivb_clk = {
 	.ops		= &fsidiv_clk_ops,
 	.parent		= &div6_reparent_clks[DIV6_FSIB],  /* late install */
 	.mapping	= &fsidivb_clk_mapping,
 };
 
 static struct clk *late_main_clks[] = {
-	&sh7372_fsidiva_clk,
-	&sh7372_fsidivb_clk,
+	&fsidiva_clk,
+	&fsidivb_clk,
 };
 
 enum { MSTP001, MSTP000,
@@ -583,6 +583,8 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_CON_ID("pllc1_clk", &pllc1_clk),
 	CLKDEV_CON_ID("pllc1_div2_clk", &pllc1_div2_clk),
 	CLKDEV_CON_ID("pllc2_clk", &sh7372_pllc2_clk),
+	CLKDEV_CON_ID("fsidiva", &fsidiva_clk),
+	CLKDEV_CON_ID("fsidivb", &fsidivb_clk),
 
 	/* DIV4 clocks */
 	CLKDEV_CON_ID("i_clk", &div4_clks[DIV4_I]),
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index d65fbbe..26cd101 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -479,8 +479,6 @@ extern struct clk sh7372_dv_clki_div2_clk;
 extern struct clk sh7372_pllc2_clk;
 extern struct clk sh7372_fsiack_clk;
 extern struct clk sh7372_fsibck_clk;
-extern struct clk sh7372_fsidiva_clk;
-extern struct clk sh7372_fsidivb_clk;
 
 extern void sh7372_intcs_suspend(void);
 extern void sh7372_intcs_resume(void);
-- 
1.7.10.4

  parent reply	other threads:[~2012-11-09  7:29 UTC|newest]

Thread overview: 78+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-09  7:29 [GIT PULL v2] Renesas ARM-based SoC for v3.8 #2 Simon Horman
2012-11-09  7:29 ` Simon Horman
2012-11-09  7:29 ` [PATCH 01/10] ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx Simon Horman
2012-11-09  7:29   ` Simon Horman
2012-11-09  7:29 ` [PATCH 02/10] ARM: shmobile: r8a7740: add USB24 clock explain Simon Horman
2012-11-09  7:29   ` Simon Horman
2012-11-09  7:29 ` [PATCH 03/10] ARM: shmobile: r8a7779: add USB EHCI clock support Simon Horman
2012-11-09  7:29   ` Simon Horman
2013-03-13 23:09   ` Sergei Shtylyov
2013-03-14  0:10     ` Sergei Shtylyov
2013-03-14  0:57     ` Kuninori Morimoto
2013-03-14  0:57       ` Kuninori Morimoto
2012-11-09  7:29 ` [PATCH 04/10] ARM: shmobile: r8a7779: add USB OHCI " Simon Horman
2012-11-09  7:29   ` Simon Horman
2012-11-09  7:29 ` [PATCH 05/10] sh: clkfwk: add sh_clk_fsidiv_register() Simon Horman
2012-11-09  7:29   ` Simon Horman
2012-11-12 22:43   ` Arnd Bergmann
2012-11-12 22:43     ` Arnd Bergmann
2012-11-13  0:33     ` [PATCH] sh: clkfwk: fixup unsed variable warning Kuninori Morimoto
2012-11-13  0:33       ` Kuninori Morimoto
2012-11-09  7:29 ` Simon Horman [this message]
2012-11-09  7:29   ` [PATCH 06/10] ARM: shmobile: sh7372: sh7372_fsidivX_clk become non-global Simon Horman
2012-11-09  7:29 ` [PATCH 07/10] ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks Simon Horman
2012-11-09  7:29   ` Simon Horman
2012-11-09  7:29 ` [PATCH 08/10] ARM: shmobile: r8a7740: add FSI-DVI clocks Simon Horman
2012-11-09  7:29   ` Simon Horman
2012-11-09  7:29 ` [PATCH 09/10] ARM: shmobile: add fsi external clock on r8a7740 Simon Horman
2012-11-09  7:29   ` Simon Horman
2012-11-09  7:29 ` [PATCH 10/10] ARM: shmobile: add fsi external clock sh7372 Simon Horman
2012-11-09  7:29   ` Simon Horman
2012-11-12 20:49 ` [GIT PULL v2] Renesas ARM-based SoC for v3.8 #2 Arnd Bergmann
2012-11-12 20:49   ` Arnd Bergmann
2013-01-25  3:55 ` [GIT PULL v2] Renesas ARM-based SoC for v3.9 Simon Horman
2013-01-25  3:55   ` Simon Horman
2013-01-25  3:55   ` [PATCH 01/15] ARM: shmobile: Remove duplicate inclusion of dma-mapping.h in setup-r8a7740.c Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 02/15] ARM: shmobile: r8a7740: add TMU timer support Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 03/15] ARM: shmobile: sh73a0: fixup div4_clks bitmap Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 04/15] ARM: mach-shmobile: sh73a0 external IRQ wake update Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 05/15] ARM: sh7372: add clock lookup entries for DT-based devices Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 06/15] ARM: sh7372: fix cache clean / invalidate order Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 07/15] ARM: shmobile: add function declarations for sh7372 DT helper functions Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 08/15] ARM: shmobile: sh73a0: Add CPU sleep suspend Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 09/15] ARM: shmobile: r8a7740: " Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 10/15] ARM: SH-Mobile: sh73a0: Secondary CPUs handle own SCU flags Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 11/15] ARM: SH-Mobile: sh73a0: Add CPU Hotplug Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 12/15] ARM: mach-shmobile: sh73a0: Allow initialisation of GIC by DT Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25 10:22     ` Mark Rutland
2013-01-25 10:22       ` Mark Rutland
2013-01-28  0:48       ` Simon Horman
2013-01-28  0:48         ` Simon Horman
2013-01-28 10:59         ` Mark Rutland
2013-01-28 10:59           ` Mark Rutland
2013-01-29  0:22           ` Simon Horman
2013-01-29  0:22             ` Simon Horman
2013-01-25  3:55   ` [PATCH 13/15] ARM: mach-shmobile: sh73a0: Minimal setup using DT Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 14/15] ARM: mach-shmobile: sh73a0: Initialise MMCIF " Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-25  3:55   ` [PATCH 15/15] ARM: shmobile: r8a7779: scif .irqs used SCIx_IRQ_MUXED() Simon Horman
2013-01-25  3:55     ` Simon Horman
2013-01-29 17:11   ` [GIT PULL v2] Renesas ARM-based SoC for v3.9 Olof Johansson
2013-01-29 17:11     ` Olof Johansson
2013-01-30  2:18     ` Simon Horman
2013-01-30  2:18       ` Simon Horman
2013-01-31  6:39       ` Simon Horman
2013-01-31  6:39         ` 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=1352446165-19298-7-git-send-email-horms@verge.net.au \
    --to=horms@verge.net.au \
    --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.