From patchwork Tue Jan 19 12:18:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 8061251 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2521C9F8AA for ; Tue, 19 Jan 2016 12:18:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FFCC20392 for ; Tue, 19 Jan 2016 12:18:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9AF0C2038A for ; Tue, 19 Jan 2016 12:18:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752814AbcASMSW (ORCPT ); Tue, 19 Jan 2016 07:18:22 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:35181 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752399AbcASMSV (ORCPT ); Tue, 19 Jan 2016 07:18:21 -0500 Received: by mail-lf0-f66.google.com with SMTP id c134so13718193lfb.2 for ; Tue, 19 Jan 2016 04:18:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=K9PjaNu1alL5YFbcvNIQ6BioxhWJT4w6mJctjxdjnRY=; b=diIxz5FwqgexyIrtpmxjyaIUBry228Zmi20zUcLH8CKoQl34UViFn7bObrrlBxx49v Osfc+j7KQLJVYO3qXQLX5ZTXnbwyA+UP95f9rKpEQyoQcHgnj/e3oD2y1c5Ct7gK6CQs XYHm2j+JGu6aYeut158idme3I1YtNKDBFfgEnj1MvAymdl8WFQ+JdtP7NgP4IDqnnbxG BSK0Gz3TK5HUCMj3VUdW4+0kOpGvE0IVNsnmoVkpeviulUz5jmda4ZWo1A7W7LJsYeqF 6Cg03mkW56rs3sMyMopDXNkndZdWYpmuoBDI+pE17aAfj6ZLBimoK2uxsv3qbTiPNgnC ArIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=K9PjaNu1alL5YFbcvNIQ6BioxhWJT4w6mJctjxdjnRY=; b=K0RxzxwRiWmTki7dugpHwccfDnOXb7OjRZHnSu4+IPdj8brwtbMfFtG33NS2Xy260W qHlwwuOze3EDlxCClJy37daiCstVdXAHpWlIm64sCU360vcKoC4SGCYymUH0/1F3PUcY 7JpKPa83S/HNCGfQS+MtFVRelezaq1tRbZwLrrHSD5bXMombHadEglMTTnTcbscTWUw8 vXODIPi1Jk8Z2BzB7aUekfTYr4B0OSsytFxdtmO+QCBdq8m5oD2xHOB5Wsdq+SvZyhUq bWBFk1Zyzv2mLdbcFdoLvUutoytSNd+OSZCkOSFmXXeesYIiTWHWsKWDaGhIDFlrpo2w pOzA== X-Gm-Message-State: ALoCoQlY1arwUOw6e4gxLJyEnvRccRgl2hjS26T6kyNnzGxRm2t4tkmNoPbP5Fhrg75Rz34qpwTHio3HJZNl70DIT2OkjxYNAw== X-Received: by 10.25.32.75 with SMTP id g72mr8694936lfg.110.1453205900378; Tue, 19 Jan 2016 04:18:20 -0800 (PST) Received: from groucho.site (ip9234e209.dynamic.kabel-deutschland.de. [146.52.226.9]) by smtp.gmail.com with ESMTPSA id nv8sm3895258lbb.7.2016.01.19.04.18.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Jan 2016 04:18:19 -0800 (PST) From: Ulrich Hecht To: linux-renesas-soc@vger.kernel.org Cc: ryo.kodama.vz@renesas.com, takeshi.kihara.df@renesas.com, harunobu.kurokawa.dn@renesas.com, magnus.damm@gmail.com, Ulrich Hecht Subject: [PATCH 4/4] arm64: dts: r8a7795: Add PWM device nodes Date: Tue, 19 Jan 2016 13:18:08 +0100 Message-Id: <1453205888-8985-5-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1453205888-8985-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1453205888-8985-1-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@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, RP_MATCHES_RCVD, T_DKIM_INVALID, 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: Ryo Kodama Signed-off-by: Ryo Kodama Signed-off-by: Harunobu Kurokawa [uli: adapted to new MSTP clock scheme] Signed-off-by: Ulrich Hecht --- .../devicetree/bindings/pwm/renesas,pwm-rcar.txt | 1 + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 21 ++++++++++ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 48 ++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt b/Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt index 0822a08..d6de643 100644 --- a/Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt +++ b/Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt @@ -7,6 +7,7 @@ Required Properties: - "renesas,pwm-r8a7790": for R-Car H2 - "renesas,pwm-r8a7791": for R-Car M2-W - "renesas,pwm-r8a7794": for R-Car E2 + - "renesas,pwm-r8a7795": for R-Car H3 - reg: base address and length of the registers block for the PWM. - #pwm-cells: should be 2. See pwm.txt in this directory for a description of the cells format. diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts index 265d12f..04661cf 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts @@ -93,6 +93,15 @@ }; &pfc { + pwm1_pins: pwm1 { + renesas,groups = "pwm1_a", "pwm1_b"; + renesas,function = "pwm1"; + }; + pwm2_pins: pwm2 { + renesas,groups = "pwm2_a", "pwm2_b"; + renesas,function = "pwm2"; + }; + scif1_pins: scif1 { renesas,groups = "scif1_data_a", "scif1_ctrl"; renesas,function = "scif1"; @@ -174,6 +183,18 @@ }; }; +&pwm1 { + pinctrl-0 = <&pwm1_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&pwm2 { + pinctrl-0 = <&pwm2_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + &rcar_sound { pinctrl-0 = <&sound_pins &sound_clk_pins>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi index bb353cd..3c88b04 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi @@ -446,6 +446,54 @@ status = "disabled"; }; + pwm1: pwm@e6e31000 { + compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar"; + reg = <0 0xe6e31000 0 0x10>; + #pwm-cells = <2>; + clocks = <&cpg CPG_MOD 523>; + status = "disabled"; + }; + + pwm2: pwm@e6e32000 { + compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar"; + reg = <0 0xe6e32000 0 0x10>; + #pwm-cells = <2>; + clocks = <&cpg CPG_MOD 523>; + status = "disabled"; + }; + + pwm3: pwm@e6e33000 { + compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar"; + reg = <0 0xe6e33000 0 0x10>; + #pwm-cells = <2>; + clocks = <&cpg CPG_MOD 523>; + status = "disabled"; + }; + + pwm4: pwm@e6e34000 { + compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar"; + reg = <0 0xe6e34000 0 0x10>; + #pwm-cells = <2>; + clocks = <&cpg CPG_MOD 523>; + status = "disabled"; + }; + + pwm5: pwm@e6e35000 { + compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar"; + reg = <0 0xe6e35000 0 0x10>; + #pwm-cells = <2>; + clocks = <&cpg CPG_MOD 523>; + status = "disabled"; + }; + + pwm6: pwm@e6e36000 { + compatible = "renesas,pwm-r8a7795", "renesas,pwm-rcar"; + reg = <0 0xe6e36000 0 0x10>; + #pwm-cells = <2>; + clocks = <&cpg CPG_MOD 523>; + status = "disabled"; + }; + scif0: serial@e6e60000 { compatible = "renesas,scif-r8a7795", "renesas,scif"; reg = <0 0xe6e60000 0 64>;