devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
To: m.chehab@samsung.com, horms@verge.net.au, magnus.damm@gmail.com,
	robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com
Cc: laurent.pinchart@ideasonboard.com, linux-sh@vger.kernel.org,
	linux-media@vger.kernel.org, devicetree@vger.kernel.org,
	Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
Subject: [PATCH 2/6] ARM: shmobile: r8a7790: Add JPU clock dt and CPG define.
Date: Tue, 19 Aug 2014 16:50:49 +0400	[thread overview]
Message-ID: <1408452653-14067-3-git-send-email-mikhail.ulyanov@cogentembedded.com> (raw)
In-Reply-To: <1408452653-14067-1-git-send-email-mikhail.ulyanov@cogentembedded.com>

Signed-off-by: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
---
 arch/arm/boot/dts/r8a7790.dtsi            | 6 +++---
 include/dt-bindings/clock/r8a7790-clock.h | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index e2e40e5..61fd193 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -868,17 +868,17 @@
 		mstp1_clks: mstp1_clks@e6150134 {
 			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
-			clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
+			clocks = <&m2_clk>, <&p_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_TMU1 R8A7790_CLK_TMU3 R8A7790_CLK_TMU2
+				R8A7790_CLK_JPU R8A7790_CLK_TMU1 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 =
-				"tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",
+				"jpu", "tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",
 				"vsp1-du0", "vsp1-rt", "vsp1-sy";
 		};
 		mstp2_clks: mstp2_clks@e6150138 {
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
index f929a79e..8ea7ab0 100644
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
@@ -26,6 +26,7 @@
 #define R8A7790_CLK_MSIOF0		0
 
 /* MSTP1 */
+#define R8A7790_CLK_JPU		6
 #define R8A7790_CLK_TMU1		11
 #define R8A7790_CLK_TMU3		21
 #define R8A7790_CLK_TMU2		22
-- 
2.1.0.rc1


  parent reply	other threads:[~2014-08-19 12:50 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-19 12:50 [PATCH 0/6] R-Car JPEG Processing Unit Mikhail Ulyanov
2014-08-19 12:50 ` [PATCH 1/6] V4L2: Add Renesas R-Car JPEG codec driver Mikhail Ulyanov
2014-08-19 13:37   ` Hans Verkuil
2014-08-22 13:39     ` Mikhail Ulianov
2014-08-22 17:03       ` Hans Verkuil
2014-08-25 12:29   ` [PATCH v2 " Mikhail Ulyanov
2014-08-25 12:39     ` Hans Verkuil
2014-08-25 12:49       ` Hans Verkuil
2014-09-21 17:56         ` Sergei Shtylyov
2014-09-21 17:56         ` Sergei Shtylyov
2014-09-23 13:31     ` Kamil Debski
2014-09-25 12:49       ` Sergei Shtylyov
2014-09-26 14:01     ` Laurent Pinchart
2014-09-23 14:02   ` [PATCH " Geert Uytterhoeven
2014-08-19 12:50 ` Mikhail Ulyanov [this message]
2014-08-20 23:07   ` [PATCH 2/6] ARM: shmobile: r8a7790: Add JPU clock dt and CPG define Laurent Pinchart
2014-08-22  1:57     ` Simon Horman
2014-08-19 12:50 ` [PATCH 3/6] ARM: shmobile: r8a7790: Add JPU device node Mikhail Ulyanov
2014-08-22  1:54   ` [3/6] " Simon Horman
2014-08-19 12:50 ` [PATCH 4/6] ARM: shmobile: r8a7791: Add JPU clock dt and CPG define Mikhail Ulyanov
2014-08-20 23:07   ` Laurent Pinchart
2014-08-22  1:56     ` Simon Horman
2014-08-19 12:50 ` [PATCH 5/6] ARM: shmobile: r8a7791: Add JPU device node Mikhail Ulyanov
2014-08-19 12:50 ` [PATCH 6/6] devicetree: bindings: Document Renesas JPEG Processing Unit Mikhail Ulyanov
2014-08-20 23:01   ` Laurent Pinchart
2014-08-22 14:20     ` Mikhail Ulianov
2014-08-25  9:49       ` Laurent Pinchart
2014-08-25 12:35   ` [PATCH v2 " Mikhail Ulyanov
2014-08-25 12:59     ` Geert Uytterhoeven
2014-08-25 23:57       ` Simon Horman
2014-08-26  0:02         ` Laurent Pinchart
2014-08-26  2:42           ` Simon Horman
2014-09-24 13:38             ` Mikhail Ulianov
2014-08-26  8:03         ` Geert Uytterhoeven
2014-08-26  9:01           ` Simon Horman
2014-08-26  9:27             ` Geert Uytterhoeven
2014-08-27  5:15               ` Simon Horman
2014-08-27  6:06                 ` Laurent Pinchart
2014-08-27  6:16                   ` 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=1408452653-14067-3-git-send-email-mikhail.ulyanov@cogentembedded.com \
    --to=mikhail.ulyanov@cogentembedded.com \
    --cc=devicetree@vger.kernel.org \
    --cc=horms@verge.net.au \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=m.chehab@samsung.com \
    --cc=magnus.damm@gmail.com \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=robh+dt@kernel.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).