From patchwork Mon Mar 27 19:42:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralph Sennhauser X-Patchwork-Id: 9647421 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8E64C602C8 for ; Mon, 27 Mar 2017 19:50:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 811C727D0E for ; Mon, 27 Mar 2017 19:50:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7588128422; Mon, 27 Mar 2017 19:50:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0375C27D0E for ; Mon, 27 Mar 2017 19:50:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=tveAZ2zOq2tu7Iv6zMwDNcbFhdaBm1rbHHrQqbi8J7g=; b=BRuUs4fTlYiwX4qxw2EasMEBf2 reBNlWTmyByMbmOWrDMCDcQ6DOhb1E/uy8izVsPXRCXBqvlXnMa5MAzzezGToZsO/Oo4ZtIYKROl+ T9m6+AxsJTWZfOEHUXCFf0gmBEEXS0cDXAwEA0QQcQci2PqsNzykAVFzcVBSvfGveySOUtha2rLDP ACaPDhadbDDqI1KLpc6wz5/FZs3B8mv2UdgfAoGpwuz+0EDTS7Fd3lyOkn1AjMEXS9lROC1uxG3Z4 CErmeeKWHBUmU1LAjBLn2DZUari5h81jWN52SEWyYFXB5b9DJ/nvuMLbFfciJ127Qoh2z7VuCqjK+ jfZkwdyQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1csaet-0003Fs-Fm; Mon, 27 Mar 2017 19:50:31 +0000 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1csaYI-0000kI-Tv for linux-arm-kernel@lists.infradead.org; Mon, 27 Mar 2017 19:43:48 +0000 Received: by mail-wr0-x242.google.com with SMTP id w43so13460629wrb.1 for ; Mon, 27 Mar 2017 12:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fXpoQ69mVIK4mi8UTQ8UDbWQynu6/DSo0K3SpKl5870=; b=Gt7Hcvncs8QoBMh0MEsm7dkdOIUy2DNy/j20n55XE4BKqXNt0878lmIJqIfzsl7773 kwcwbQrPHwO+nL2hmWonjXVUXfWxvOV19Hm66wgmXGVgZ4eBdQ2NTUsNDMWYJFvFMpJt bFKtzbMtpDWuoEzw15/5od1UlRGX0QbJig22JMI0W6wf5oWD0iHM4meP9UlBtLM39mJ3 AyjLwoV4nSMiTkYGndKqiRa2XwyIku89PrS5F8UfyN+WCH+nv/WlZ9NT0WHWgKkOA6w5 dTTRUZzK/GIloQmvQ/effBotTUOdoGRJ22KIrLlzOFKGOpT+vxHd4sCDRGRxnIq1RPte DtGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fXpoQ69mVIK4mi8UTQ8UDbWQynu6/DSo0K3SpKl5870=; b=pp2vYlNPyftJxPmKVFMBtxjj4J7cRML7V8dfosb78hvnpzkNcDYH9felxow3bwNVVA TK7y0pWLGpF8dNGOsf+3tNKkOgzO9gJDtj9POmhFkR99r0q/JfPDvz+u+F2bYbcm9fiK LTnogTSgnTSxXw73SlazKtV5NM3zCkr6Jj4CpYAKy//qpc+hLWnQdO+4UClRmV12UodJ zHHV9VNl4N/JbY74IgQDu5Vw2tr0N1a3zLURVGOQPfMnUE8KbkRzJus8KGeADvvMYzff gOnC6q84q+FlLg25ZNgVwOoZftpENt/AG+WYJ0eOMExdxkGFaHmLE4Boqyfh45O5mrKQ 8lWA== X-Gm-Message-State: AFeK/H1SzmKnx0pa6Zxn3p/uiXCohAykZOwtqwmvakvHYRDdB7T0VUMqdlktixbNEEwz0g== X-Received: by 10.28.211.9 with SMTP id k9mr11112607wmg.96.1490643794114; Mon, 27 Mar 2017 12:43:14 -0700 (PDT) Received: from localhost.lan ([37.209.189.139]) by smtp.googlemail.com with ESMTPSA id k203sm701657wmk.4.2017.03.27.12.43.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Mar 2017 12:43:13 -0700 (PDT) From: Ralph Sennhauser To: Linus Walleij , Thierry Reding Subject: [PATCH v4 2/4] mvebu: xp: Add PWM properties to .dtsi files Date: Mon, 27 Mar 2017 21:42:58 +0200 Message-Id: <20170327194301.1104-3-ralph.sennhauser@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170327194301.1104-1-ralph.sennhauser@gmail.com> References: <20170327194301.1104-1-ralph.sennhauser@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170327_124343_499909_159771C4 X-CRM114-Status: GOOD ( 10.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Andrew Lunn , Jason Cooper , Alexandre Courbot , linux-gpio@vger.kernel.org, Russell King , linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org, Gregory Clement , devicetree@vger.kernel.org, Rob Herring , Ralph Sennhauser , Imre Kaloz , linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andrew Lunn Add properties to the GPIO nodes to allow them to be also used as PWM lines. Signed-off-by: Andrew Lunn URL: https://patchwork.ozlabs.org/patch/427294/ [Ralph Sennhauser: * Use new compatible string marvell,armada-370-xp-gpio * Add missing reg-names / #pwm-cell properties to armada-xp-mv78260.dtsi 'gpio1' node] Signed-off-by: Ralph Sennhauser --- arch/arm/boot/dts/armada-370.dtsi | 16 +++++++++++----- arch/arm/boot/dts/armada-xp-mv78230.dtsi | 14 ++++++++++---- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 16 +++++++++++----- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 16 +++++++++++----- 4 files changed, 43 insertions(+), 19 deletions(-) diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index cc011c8..e30b076 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -137,29 +137,35 @@ }; gpio0: gpio@18100 { - compatible = "marvell,orion-gpio"; - reg = <0x18100 0x40>; + compatible = "marvell,armada-370-xp-gpio"; + reg = <0x18100 0x40>, <0x181c0 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <2>; interrupt-controller; #interrupt-cells = <2>; interrupts = <82>, <83>, <84>, <85>; + clocks = <&coreclk 0>; }; gpio1: gpio@18140 { - compatible = "marvell,orion-gpio"; - reg = <0x18140 0x40>; + compatible = "marvell,armada-370-xp-gpio"; + reg = <0x18140 0x40>, <0x181c8 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <2>; interrupt-controller; #interrupt-cells = <2>; interrupts = <87>, <88>, <89>, <90>; + clocks = <&coreclk 0>; }; gpio2: gpio@18180 { - compatible = "marvell,orion-gpio"; + compatible = "marvell,armada-370-xp-gpio"; reg = <0x18180 0x40>; ngpios = <2>; gpio-controller; diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index 07c5090..429ac10 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi @@ -202,25 +202,31 @@ internal-regs { gpio0: gpio@18100 { - compatible = "marvell,orion-gpio"; - reg = <0x18100 0x40>; + compatible = "marvell,armada-370-xp-gpio"; + reg = <0x18100 0x40>, <0x181c0 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <2>; interrupt-controller; #interrupt-cells = <2>; interrupts = <82>, <83>, <84>, <85>; + clocks = <&coreclk 0>; }; gpio1: gpio@18140 { - compatible = "marvell,orion-gpio"; - reg = <0x18140 0x40>; + compatible = "marvell,armada-370-xp-gpio"; + reg = <0x18140 0x40>, <0x181c8 0x08>; + reg-names = "gpio", "pwm"; ngpios = <17>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <2>; interrupt-controller; #interrupt-cells = <2>; interrupts = <87>, <88>, <89>; + clocks = <&coreclk 0>; }; }; }; diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index 64e936a..333c470 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi @@ -285,29 +285,35 @@ internal-regs { gpio0: gpio@18100 { - compatible = "marvell,orion-gpio"; - reg = <0x18100 0x40>; + compatible = "marvell,armada-370-xp-gpio"; + reg = <0x18100 0x40>, <0x181c0 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <2>; interrupt-controller; #interrupt-cells = <2>; interrupts = <82>, <83>, <84>, <85>; + clocks = <&coreclk 0>; }; gpio1: gpio@18140 { - compatible = "marvell,orion-gpio"; - reg = <0x18140 0x40>; + compatible = "marvell,armada-370-xp-gpio"; + reg = <0x18140 0x40>, <0x181c8 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <2>; interrupt-controller; #interrupt-cells = <2>; interrupts = <87>, <88>, <89>, <90>; + clocks = <&coreclk 0>; }; gpio2: gpio@18180 { - compatible = "marvell,orion-gpio"; + compatible = "marvell,armada-370-xp-gpio"; reg = <0x18180 0x40>; ngpios = <3>; gpio-controller; diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index d1383dd..2ff825d 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi @@ -323,29 +323,35 @@ internal-regs { gpio0: gpio@18100 { - compatible = "marvell,orion-gpio"; - reg = <0x18100 0x40>; + compatible = "marvell,armada-370-xp-gpio"; + reg = <0x18100 0x40>, <0x181c0 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <2>; interrupt-controller; #interrupt-cells = <2>; interrupts = <82>, <83>, <84>, <85>; + clocks = <&coreclk 0>; }; gpio1: gpio@18140 { - compatible = "marvell,orion-gpio"; - reg = <0x18140 0x40>; + compatible = "marvell,armada-370-xp-gpio"; + reg = <0x18140 0x40>, <0x181c8 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <2>; interrupt-controller; #interrupt-cells = <2>; interrupts = <87>, <88>, <89>, <90>; + clocks = <&coreclk 0>; }; gpio2: gpio@18180 { - compatible = "marvell,orion-gpio"; + compatible = "marvell,armada-370-xp-gpio"; reg = <0x18180 0x40>; ngpios = <3>; gpio-controller;