From: ykaneko0929@gmail.com (Yoshihiro Kaneko)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/4] ARM: shmobile: r8a7790: Add MMP clock to device tree
Date: Thu, 9 Oct 2014 19:03:04 +0900 [thread overview]
Message-ID: <1412848985-29353-4-git-send-email-ykaneko0929@gmail.com> (raw)
In-Reply-To: <1412848985-29353-1-git-send-email-ykaneko0929@gmail.com>
From: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
Signed-off-by: Yoshifumi Hosoya <yoshifumi.hosoya.wj@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
---
arch/arm/boot/dts/r8a7790.dtsi | 22 ++++++++++++++--------
include/dt-bindings/clock/r8a7790-clock.h | 11 ++++++++++-
2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 27c038c..244a838 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -938,18 +938,24 @@
mstp1_clks: mstp1_clks at e6150134 {
compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
- clocks = <&m2_clk>, <&p_clk>, <&zg_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
- <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>,
- <&zs_clk>;
+ clocks = <&zs_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>, <&m2_clk>,
+ <&zs_clk>, <&p_clk>, <&zg_clk>, <&zs_clk>, <&zs_clk>,
+ <&zs_clk>, <&zs_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
+ <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>;
#clock-cells = <1>;
renesas,clock-indices = <
- R8A7790_CLK_JPU R8A7790_CLK_TMU1 R8A7790_CLK_PVRSRVKM
- R8A7790_CLK_TMU3 R8A7790_CLK_TMU2
- R8A7790_CLK_CMT0 R8A7790_CLK_TMU0 R8A7790_CLK_VSP1_DU1
- R8A7790_CLK_VSP1_DU0 R8A7790_CLK_VSP1_R R8A7790_CLK_VSP1_S
+ R8A7790_CLK_VCP1 R8A7790_CLK_VCP0 R8A7790_CLK_VPC1
+ R8A7790_CLK_VPC0 R8A7790_CLK_JPU R8A7790_CLK_SSP1
+ R8A7790_CLK_TMU1 R8A7790_CLK_PVRSRVKM R8A7790_CLK_2DDMAC
+ R8A7790_CLK_FDP2 R8A7790_CLK_FDP1 R8A7790_CLK_FDP0
+ R8A7790_CLK_TMU3 R8A7790_CLK_TMU2 R8A7790_CLK_CMT0
+ R8A7790_CLK_TMU0 R8A7790_CLK_VSP1_DU1 R8A7790_CLK_VSP1_DU0
+ R8A7790_CLK_VSP1_R R8A7790_CLK_VSP1_S
>;
clock-output-names =
- "jpu", "tmu1", "pvrsrvkm", "tmu3", "tmu2", "cmt0", "tmu0",
+ "vcp1", "vcp0", "vpc1", "vpc0", "jpu", "ssp1",
+ "tmu1", "pvrsrvkm", "2ddmac", "fdp2", "fdp1",
+ "fdp0", "tmu3", "tmu2", "cmt0", "tmu0",
"vsp1-du1", "vsp1-du0", "vsp1-rt", "vsp1-sy";
};
mstp2_clks: mstp2_clks at e6150138 {
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
index 2d2f668..15ea834 100644
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
@@ -26,9 +26,18 @@
#define R8A7790_CLK_MSIOF0 0
/* MSTP1 */
-#define R8A7790_CLK_JPU 6
+#define R8A7790_CLK_VCP1 0
+#define R8A7790_CLK_VCP0 1
+#define R8A7790_CLK_VPC1 2
+#define R8A7790_CLK_VPC0 3
+#define R8A7790_CLK_JPU 6
+#define R8A7790_CLK_SSP1 9
#define R8A7790_CLK_TMU1 11
#define R8A7790_CLK_PVRSRVKM 12
+#define R8A7790_CLK_2DDMAC 15
+#define R8A7790_CLK_FDP2 17
+#define R8A7790_CLK_FDP1 18
+#define R8A7790_CLK_FDP0 19
#define R8A7790_CLK_TMU3 21
#define R8A7790_CLK_TMU2 22
#define R8A7790_CLK_CMT0 24
--
1.9.1
next prev parent reply other threads:[~2014-10-09 10:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-09 10:03 [PATCH 0/4] ARM: shmobile: Add clock to DT Yoshihiro Kaneko
2014-10-09 10:03 ` [PATCH 1/4] ARM: shmobile: r8a7790: Add RGX clock to device tree Yoshihiro Kaneko
2014-10-09 12:27 ` Geert Uytterhoeven
2014-10-10 1:26 ` Simon Horman
2014-10-20 0:53 ` Magnus Damm
2014-10-21 16:02 ` Simon Horman
2014-10-22 9:31 ` Kouei Abe
2014-10-09 10:03 ` [PATCH 2/4] ARM: shmobile: r8a7791: Add SGX " Yoshihiro Kaneko
2014-10-09 10:03 ` Yoshihiro Kaneko [this message]
2014-10-09 12:29 ` [PATCH 3/4] ARM: shmobile: r8a7790: Add MMP " Geert Uytterhoeven
2014-10-10 1:24 ` Simon Horman
2014-10-10 2:46 ` Yoshihiro Kaneko
2014-10-09 10:03 ` [PATCH 4/4] ARM: shmobile: r8a7791: " Yoshihiro Kaneko
-- strict thread matches above, loose matches on Subject: below --
2014-10-14 7:01 [PATCH 0/4] ARM: shmobile: Add clock to DT Yoshihiro Kaneko
2014-10-14 7:01 ` [PATCH 3/4] ARM: shmobile: r8a7790: Add MMP clock to device tree Yoshihiro Kaneko
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=1412848985-29353-4-git-send-email-ykaneko0929@gmail.com \
--to=ykaneko0929@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 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).