From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 7/7] ARM: shmobile: r8a7740: add FSI-DVI clocks
Date: Thu, 08 Nov 2012 01:27:36 +0000 [thread overview]
Message-ID: <1352338056-21107-8-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1352338056-21107-1-git-send-email-horms@verge.net.au>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/clock-r8a7740.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index 6729e00..71ee224 100644
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@ -65,6 +65,9 @@
#define SMSTPCR3 IOMEM(0xe615013c)
#define SMSTPCR4 IOMEM(0xe6150140)
+#define FSIDIVA IOMEM(0xFE1F8000)
+#define FSIDIVB IOMEM(0xFE1F8008)
+
/* Fixed 32 KHz root clock from EXTALR pin */
static struct clk extalr_clk = {
.rate = 32768,
@@ -427,6 +430,14 @@ static struct clk *late_main_clks[] = {
&hdmi2_clk,
};
+/* FSI DIV */
+enum { FSIDIV_A, FSIDIV_B, FSIDIV_REPARENT_NR };
+
+static struct clk fsidivs[] = {
+ [FSIDIV_A] = SH_CLK_FSIDIV(FSIDIVA, &div6_reparent_clks[DIV6_FSIA]),
+ [FSIDIV_B] = SH_CLK_FSIDIV(FSIDIVB, &div6_reparent_clks[DIV6_FSIB]),
+};
+
/* MSTP */
enum {
DIV4_I, DIV4_ZG, DIV4_B, DIV4_M1, DIV4_HP,
@@ -596,6 +607,8 @@ static struct clk_lookup lookups[] = {
CLKDEV_ICK_ID("icka", "sh_fsi2", &div6_reparent_clks[DIV6_FSIA]),
CLKDEV_ICK_ID("ickb", "sh_fsi2", &div6_reparent_clks[DIV6_FSIB]),
+ CLKDEV_ICK_ID("diva", "sh_fsi2", &fsidivs[FSIDIV_A]),
+ CLKDEV_ICK_ID("divb", "sh_fsi2", &fsidivs[FSIDIV_B]),
};
void __init r8a7740_clock_init(u8 md_ck)
@@ -641,6 +654,9 @@ void __init r8a7740_clock_init(u8 md_ck)
for (k = 0; !ret && (k < ARRAY_SIZE(late_main_clks)); k++)
ret = clk_register(late_main_clks[k]);
+ if (!ret)
+ ret = sh_clk_fsidiv_register(fsidivs, FSIDIV_REPARENT_NR);
+
clkdev_add_table(lookups, ARRAY_SIZE(lookups));
if (!ret)
--
1.7.10.4
next prev parent reply other threads:[~2012-11-08 1:27 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-28 2:26 [GIT PULL v2] Renesas ARM-based SoC boards for v3.8 Simon Horman
2012-10-28 2:26 ` [PATCH 01/12] ARM: shmobile: r8a7740: Enable PMU Simon Horman
2012-10-28 11:28 ` Sergei Shtylyov
2012-10-29 5:11 ` Simon Horman
2012-10-28 2:26 ` [PATCH 02/12] ARM: shmobile: kzm9g: enable magnetometer ak8975 Simon Horman
2012-10-28 2:26 ` [PATCH 03/12] ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345 Simon Horman
2012-10-28 2:26 ` [PATCH 04/12] ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2 Simon Horman
2012-10-28 2:26 ` [PATCH 05/12] ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372 Simon Horman
2012-10-28 2:26 ` [PATCH 06/12] ARM: shmobile: armadillo800eva: enable restart Simon Horman
2012-10-28 2:26 ` [PATCH 07/12] ARM: shmobile: r8a7779: add HSPI clock support Simon Horman
2012-10-28 2:26 ` [PATCH 08/12] ARM: shmobile: r8a7779: add I2C " Simon Horman
2012-10-28 2:26 ` [PATCH 09/12] ARM: shmobile: r8a7779: add I2C driver support Simon Horman
2012-10-28 2:26 ` [PATCH 10/12] ARM: shmobile: marzen: add HSPI support Simon Horman
2012-10-28 2:26 ` [PATCH 11/12] ARM: shmobile: r8a7740: fixup DT machine desc name typo Simon Horman
2012-10-28 2:26 ` [PATCH 12/12] ARM: mach-shmobile: Use DT_MACHINE for mackerel Simon Horman
2012-10-28 9:37 ` Thomas Petazzoni
2012-10-28 10:44 ` Simon Horman
2012-10-28 10:57 ` Thomas Petazzoni
2012-11-08 1:27 ` [GIT PULL v2] Renesas ARM-based SoC boards for v3.8 #2 Simon Horman
2012-11-08 1:27 ` [PATCH 1/7] ARM: shmobile: marzen: add USB phy support Simon Horman
2012-11-08 1:27 ` [PATCH 2/7] ARM: shmobile: marzen: add USB EHCI driver support Simon Horman
2012-11-08 1:27 ` [PATCH 3/7] ARM: shmobile: marzen: add USB OHCI " Simon Horman
2012-11-08 1:27 ` [PATCH 4/7] sh: clkfwk: add sh_clk_fsidiv_register() Simon Horman
2012-11-08 1:27 ` [PATCH 5/7] ARM: shmobile: sh7372: sh7372_fsidivX_clk become non-global Simon Horman
2012-11-08 1:27 ` [PATCH 6/7] ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks Simon Horman
2012-11-08 1:27 ` Simon Horman [this message]
2012-11-08 6:29 ` [GIT PULL v2] Renesas ARM-based SoC boards for v3.8 #2 Simon Horman
2012-11-20 0:43 ` [GIT PULL v2] Renesas ARM-based SoC boards for v3.8 #3 Simon Horman
2012-11-20 0:43 ` [PATCH] ARM: shmobile: mackerel: Add FLCTL IRQ resource Simon Horman
2012-11-21 7:21 ` [GIT PULL v2] Renesas ARM-based SoC boards for v3.8 #3 Olof Johansson
2013-03-19 2:17 ` [GIT PULL v2] Renesas ARM-based SoC board updates for v3.10 Simon Horman
2013-03-19 2:17 ` [PATCH 01/13] ARM: shmobile: use GPIO SD-card detection on armadillo800eva Simon Horman
2013-03-19 2:17 ` [PATCH 02/13] ARM: shmobile: switch SDHI0 to GPIO regulator " Simon Horman
2013-03-19 2:17 ` [PATCH 03/13] ARM: shmobile: streamline mackerel SD and MMC devices Simon Horman
2013-03-19 2:17 ` [PATCH 04/13] ARM: shmobile: mark mackerel sh_mmcif_device __maybe_unused Simon Horman
2013-03-19 2:17 ` [PATCH 05/13] ARM: shmobile: marzen: Reference DT implementation Simon Horman
2013-03-19 2:17 ` [PATCH 06/13] ARM: shmobile: kzm9g: " Simon Horman
2013-03-19 2:17 ` [PATCH 07/13] ARM: shmobile: parse DT and configure pinmux early on kzm9g-reference Simon Horman
2013-03-19 2:17 ` [PATCH 08/13] ARM: shmobile: SDHI and MMCIF interfaces to kzm9g-reference Simon Horman
2013-03-19 2:17 ` [PATCH 09/13] ARM: shmobile: simplify kzm9g Kconfig dependencies Simon Horman
2013-03-19 2:17 ` [PATCH 10/13] ARM: shmobile: kzm9g: Remove warning about SMP Simon Horman
2013-03-19 2:17 ` [PATCH 11/13] ARM: shmobile: kzm9g: Trim reference DT_MACHINE_START Simon Horman
2013-03-19 2:18 ` [PATCH 12/13] ARM: shmobile: marzen: Use gic_iid macro for ICCIAR / interrupt ID Simon Horman
2013-03-19 2:18 ` [PATCH 13/13] ARM: shmobile: kzm9g: correct smsc regulator registration Simon Horman
2013-03-21 17:18 ` [GIT PULL v2] Renesas ARM-based SoC board updates for v3.10 Arnd Bergmann
2013-03-21 19:22 ` Arnd Bergmann
2013-03-22 0:32 ` Simon Horman
2013-03-22 0:58 ` Simon Horman
2013-03-22 12:40 ` Arnd Bergmann
2013-03-22 13:52 ` Simon Horman
2013-03-22 15:39 ` Arnd Bergmann
2013-03-27 5:30 ` Simon Horman
2013-03-27 9:54 ` Magnus Damm
2013-03-27 11:37 ` Arnd Bergmann
2013-04-01 9:15 ` Magnus Damm
2013-04-02 10:09 ` Arnd Bergmann
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=1352338056-21107-8-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 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).