linux-spi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert+renesas-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
To: linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Geert Uytterhoeven
	<geert+renesas-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
Subject: [PATCH 2/6] ARM: shmobile: r7s72100: Add RSPI clocks
Date: Tue, 24 Dec 2013 12:56:46 +0100	[thread overview]
Message-ID: <1387886210-3634-3-git-send-email-geert+renesas@linux-m68k.org> (raw)
In-Reply-To: <1387886210-3634-1-git-send-email-geert+renesas-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>

Signed-off-by: Geert Uytterhoeven <geert+renesas-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
---
 arch/arm/mach-shmobile/clock-r7s72100.c |   21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c
index 1ba578337b27..0f67a1b20118 100644
--- a/arch/arm/mach-shmobile/clock-r7s72100.c
+++ b/arch/arm/mach-shmobile/clock-r7s72100.c
@@ -22,13 +22,15 @@
 #include <mach/common.h>
 #include <mach/r7s72100.h>
 
-/* registers */
+/* Frequency Control Registers */
 #define FRQCR		0xfcfe0010
 #define FRQCR2		0xfcfe0014
+/* Standby Control Registers */
 #define STBCR3		0xfcfe0420
 #define STBCR4		0xfcfe0424
 #define STBCR7		0xfcfe0430
 #define STBCR9		0xfcfe0438
+#define STBCR10		0xfcfe043c
 
 #define PLL_RATE 30
 
@@ -146,12 +148,20 @@ struct clk div4_clks[DIV4_NR] = {
 					| CLK_ENABLE_ON_INIT),
 };
 
-enum {	MSTP97, MSTP96, MSTP95, MSTP94,
+enum {
+	MSTP107, MSTP106, MSTP105, MSTP104, MSTP103,
+	MSTP97, MSTP96, MSTP95, MSTP94,
 	MSTP74,
 	MSTP47, MSTP46, MSTP45, MSTP44, MSTP43, MSTP42, MSTP41, MSTP40,
-	MSTP33,	MSTP_NR };
+	MSTP33,	MSTP_NR
+};
 
 static struct clk mstp_clks[MSTP_NR] = {
+	[MSTP107] = SH_CLK_MSTP8(&peripheral1_clk, STBCR10, 7, 0), /* RSPI0 */
+	[MSTP106] = SH_CLK_MSTP8(&peripheral1_clk, STBCR10, 6, 0), /* RSPI1 */
+	[MSTP105] = SH_CLK_MSTP8(&peripheral1_clk, STBCR10, 5, 0), /* RSPI2 */
+	[MSTP104] = SH_CLK_MSTP8(&peripheral1_clk, STBCR10, 4, 0), /* RSPI3 */
+	[MSTP103] = SH_CLK_MSTP8(&peripheral1_clk, STBCR10, 3, 0), /* RSPI4 */
 	[MSTP97] = SH_CLK_MSTP8(&peripheral0_clk, STBCR9, 7, 0), /* RIIC0 */
 	[MSTP96] = SH_CLK_MSTP8(&peripheral0_clk, STBCR9, 6, 0), /* RIIC1 */
 	[MSTP95] = SH_CLK_MSTP8(&peripheral0_clk, STBCR9, 5, 0), /* RIIC2 */
@@ -179,6 +189,11 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]),
 
 	/* MSTP clocks */
+	CLKDEV_DEV_ID("rspi0", &mstp_clks[MSTP107]),
+	CLKDEV_DEV_ID("rspi1", &mstp_clks[MSTP106]),
+	CLKDEV_DEV_ID("rspi2", &mstp_clks[MSTP105]),
+	CLKDEV_DEV_ID("rspi3", &mstp_clks[MSTP104]),
+	CLKDEV_DEV_ID("rspi4", &mstp_clks[MSTP103]),
 	CLKDEV_DEV_ID("fcfee000.i2c", &mstp_clks[MSTP97]),
 	CLKDEV_DEV_ID("fcfee400.i2c", &mstp_clks[MSTP96]),
 	CLKDEV_DEV_ID("fcfee800.i2c", &mstp_clks[MSTP95]),
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2013-12-24 11:56 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-24 11:56 [PATCH 0/6] Preliminary SoC and board integration for RSPI on RZ/A1H Geert Uytterhoeven
2013-12-24 11:56 ` [PATCH 1/6] pinctrl: sh-pfc: r7s72100: Add RSPI support Geert Uytterhoeven
2014-01-07 19:03   ` Linus Walleij
2014-01-07 19:07     ` Geert Uytterhoeven
     [not found] ` <1387886210-3634-1-git-send-email-geert+renesas-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
2013-12-24 11:56   ` Geert Uytterhoeven [this message]
2013-12-25  0:51     ` [PATCH 2/6] ARM: shmobile: r7s72100: Add RSPI clocks Kuninori Morimoto
2013-12-24 11:56   ` [PATCH 3/6] ARM: shmobile: r7s72100: Add RSPI resources Geert Uytterhoeven
2013-12-24 15:41     ` Sergei Shtylyov
2013-12-24 11:56   ` [PATCH 4/6] [RFC] Documentation: dt: Add Renesas RSPI/QSPI bindings Geert Uytterhoeven
     [not found]     ` <1387886210-3634-5-git-send-email-geert+renesas-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>
2013-12-27 16:18       ` Laurent Pinchart
2013-12-27 19:01         ` Geert Uytterhoeven
     [not found]           ` <CAMuHMdXrPamASqFz8eCVxE0WKT=cdkrzxjDDT84m_AHT+1nmEA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-12-29 23:22             ` Laurent Pinchart
2013-12-30  9:37               ` Geert Uytterhoeven
     [not found]                 ` <CAMuHMdUnf77Z1u=d8zFZk0vQtGJ9QhhCk6KVJsVKS-iMFSMUKw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-12-30 15:18                   ` Laurent Pinchart
2013-12-30 17:20                     ` Geert Uytterhoeven
2013-12-24 11:56   ` [PATCH 6/6] [RFC] arm: shmobile: genmai reference: Add RSPI nodes Geert Uytterhoeven
2013-12-24 15:45     ` Sergei Shtylyov
2013-12-24 19:46       ` Geert Uytterhoeven
2013-12-27 16:20     ` Laurent Pinchart
2013-12-27 19:08       ` Geert Uytterhoeven
     [not found]         ` <CAMuHMdVH4PyhxR3JLLPX9a3fKaEgdpQpd2aa4YKL6DUD8+Pw2Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-12-28 11:48           ` Laurent Pinchart
2013-12-24 11:56 ` [PATCH 5/6] [RFC] ARM: shmobile: r7s72100 dtsi: " Geert Uytterhoeven

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=1387886210-3634-3-git-send-email-geert+renesas@linux-m68k.org \
    --to=geert+renesas-td1emuhucqxl1znqvxdv9g@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.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).