aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>2014-12-07 19:54:36 -0500
committerSimon Horman <horms+renesas@verge.net.au>2014-12-21 02:57:18 -0500
commit22a9b44fc17e83417fa890123a33164ea37fc10c (patch)
treee1cc5c0e79e22f79df54558fe415451b7f51010f
parent00add867b802b3023b49433b9002fba79f042acc (diff)
ARM: shmobile: r8a7794: Add USBDMAC[01] clocks to device tree
Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com> [horms: merged per-clock patches] Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
-rw-r--r--arch/arm/boot/dts/r8a7794.dtsi7
-rw-r--r--include/dt-bindings/clock/r8a7794-clock.h2
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index e53765493346..13e4a8d73029 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -493,13 +493,14 @@
493 mstp3_clks: mstp3_clks@e615013c { 493 mstp3_clks: mstp3_clks@e615013c {
494 compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks"; 494 compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
495 reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>; 495 reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
496 clocks = <&rclk_clk>; 496 clocks = <&rclk_clk>, <&hp_clk>, <&hp_clk>;
497 #clock-cells = <1>; 497 #clock-cells = <1>;
498 clock-indices = < 498 clock-indices = <
499 R8A7794_CLK_CMT1 499 R8A7794_CLK_CMT1 R8A7794_CLK_USBDMAC0
500 R8A7794_CLK_USBDMAC1
500 >; 501 >;
501 clock-output-names = 502 clock-output-names =
502 "cmt1"; 503 "cmt1", "usbdmac0", "usbdmac1";
503 }; 504 };
504 mstp7_clks: mstp7_clks@e615014c { 505 mstp7_clks: mstp7_clks@e615014c {
505 compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks"; 506 compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
index 94e2bbf7ddc1..52492d85fea1 100644
--- a/include/dt-bindings/clock/r8a7794-clock.h
+++ b/include/dt-bindings/clock/r8a7794-clock.h
@@ -51,6 +51,8 @@
51 51
52/* MSTP3 */ 52/* MSTP3 */
53#define R8A7794_CLK_CMT1 29 53#define R8A7794_CLK_CMT1 29
54#define R8A7794_CLK_USBDMAC0 30
55#define R8A7794_CLK_USBDMAC1 31
54 56
55/* MSTP5 */ 57/* MSTP5 */
56#define R8A7794_CLK_THERMAL 22 58#define R8A7794_CLK_THERMAL 22