From patchwork Tue Aug 19 12:50:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikhail Ulyanov X-Patchwork-Id: 4742581 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C83B0C0338 for ; Tue, 19 Aug 2014 12:53:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A020F2015D for ; Tue, 19 Aug 2014 12:53:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2EE32015E for ; Tue, 19 Aug 2014 12:53:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753034AbaHSMxI (ORCPT ); Tue, 19 Aug 2014 08:53:08 -0400 Received: from mail-la0-f51.google.com ([209.85.215.51]:59064 "EHLO mail-la0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752933AbaHSMxG (ORCPT ); Tue, 19 Aug 2014 08:53:06 -0400 Received: by mail-la0-f51.google.com with SMTP id pn19so5712219lab.24 for ; Tue, 19 Aug 2014 05:53:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=x+kGuXE+PRqvh4auZ18KkKsu4BA7sNdhIBCZIuEVy30=; b=mQLlKQi5n/gIbn/fjGjemYO/gO/jZhwBjgAfr8ssI/Grs31TQzO5cwkcYNNHfahVOA Lau2rnkBNPEc3jax0ijBzu7jKzmtSBOe8wJm32O+iVK/eSku0arPVfFgNAED22XY8LhY 4WP4UmlDC/viy2S1YnzfTuM1alz6myFN7i6TUhccKgAINLHhBT0neAJQncMuvGSTE7t1 PmPmaYEge38aNM3Bk/y5p290f3VMi/OrwQGKLX6lf14fL7M3vTK0EJrdQ4Lbr17BRNAZ x+YhBLmfZEZG67QxfDxbhz/XyNwUJIHowctX+8X+ADlSKRjCbbVkYmv603D/Gycc/FCk Bzxg== X-Gm-Message-State: ALoCoQkHZtJGrMsSeRw4CZVEd7AXYUVZRIiQO4aIGGXR6crLQGDuM1DSfs5REb/+bJB1T+kKA+lF X-Received: by 10.112.52.130 with SMTP id t2mr19106912lbo.61.1408452784941; Tue, 19 Aug 2014 05:53:04 -0700 (PDT) Received: from localhost.localdomain (178-16-155-142.obit.ru. [178.16.155.142]) by mx.google.com with ESMTPSA id m9sm32023870lbd.28.2014.08.19.05.53.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Aug 2014 05:53:04 -0700 (PDT) From: Mikhail Ulyanov 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 Subject: [PATCH 2/6] ARM: shmobile: r8a7790: Add JPU clock dt and CPG define. Date: Tue, 19 Aug 2014 16:50:49 +0400 Message-Id: <1408452653-14067-3-git-send-email-mikhail.ulyanov@cogentembedded.com> X-Mailer: git-send-email 2.1.0.rc1 In-Reply-To: <1408452653-14067-1-git-send-email-mikhail.ulyanov@cogentembedded.com> References: <1408452653-14067-1-git-send-email-mikhail.ulyanov@cogentembedded.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Mikhail Ulyanov Acked-by: Laurent Pinchart --- 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