From patchwork Thu Oct 9 10:03:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Kaneko X-Patchwork-Id: 5057401 Return-Path: X-Original-To: patchwork-linux-sh@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 C5026C11AC for ; Thu, 9 Oct 2014 10:05:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE11E2015D for ; Thu, 9 Oct 2014 10:05:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17BE9201BC for ; Thu, 9 Oct 2014 10:05:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751796AbaJIKFD (ORCPT ); Thu, 9 Oct 2014 06:05:03 -0400 Received: from mail-ig0-f170.google.com ([209.85.213.170]:37724 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752770AbaJIKFD (ORCPT ); Thu, 9 Oct 2014 06:05:03 -0400 Received: by mail-ig0-f170.google.com with SMTP id hn15so2473076igb.3 for ; Thu, 09 Oct 2014 03:05:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1h8k2Nc4x2G5zfpO2wM7opi+Vl9bjw07P8QSPaQTrEc=; b=c2/9cK3Ox7WKFuqqd1ik6Do+KV1IVAcTiJGwG7BoM3o8YBj3DT8ZJKA2Vie2xmI0WF XQfFBdRpTuWTGaY4TCTwDENfbKsJ+8glf0yzVJYgagSjYgfv4AsTB4llznZjYkBTL4VP LUzWQ6PpMVT9a0v0ch52JOH2Q5ZmKwuq1jJ2ldgOXbFSESrO9P8btvxl+XwoatoG41/I ST1LHyWj1NoK3KLixr+f0AMey4QITWt3SvtRoblE0z3Mb5GX/1vGE9hAnkW6iVVj2hBa tgzBLxo//nvosWaAbbZUyW0gZDW5VYIgPr8IakkpQOcbcPYEiSQr/BOCuAvaFoLqCNPu hylg== X-Received: by 10.42.102.199 with SMTP id j7mr6399439ico.69.1412849102274; Thu, 09 Oct 2014 03:05:02 -0700 (PDT) Received: from localhost.localdomain (p5095-ipngn6701marunouchi.tokyo.ocn.ne.jp. [153.174.4.95]) by mx.google.com with ESMTPSA id jj6sm20456139igb.15.2014.10.09.03.05.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Oct 2014 03:05:01 -0700 (PDT) From: Yoshihiro Kaneko To: linux-sh@vger.kernel.org Cc: Simon Horman , Magnus Damm , 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 Message-Id: <1412848985-29353-4-git-send-email-ykaneko0929@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412848985-29353-1-git-send-email-ykaneko0929@gmail.com> References: <1412848985-29353-1-git-send-email-ykaneko0929@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_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 From: Yoshifumi Hosoya Signed-off-by: Yoshifumi Hosoya Signed-off-by: Yoshihiro Kaneko --- 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@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@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