From patchwork Fri Mar 24 14:18:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralph Sennhauser X-Patchwork-Id: 9642923 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 20200601E9 for ; Fri, 24 Mar 2017 14:19:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1091426530 for ; Fri, 24 Mar 2017 14:19:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0503F26E8A; Fri, 24 Mar 2017 14:19:43 +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 9322526530 for ; Fri, 24 Mar 2017 14:19:42 +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=SxGBv48g2uOqfGnDEH2fxXdVsOTUrXr9EM3/52ji8KI=; b=UH9qI2vuzWbcfWezZEABBrYFN6 F6/ElokAOk5o+4hMABVdytrfvc+b8oiQ0cnA//XZ60EqcR/eQ4JSkeX1tTs4WEmqe37q5v8z5LNWL rmjwLTxihGN2eBQEerE8ug73RJ5DCdbOQOl9Vwkz9LgSnfUF3fHiswZuhOOZvlzdvM9ig9FGXUvEW HYEn+1DNpMTkSC7Lc6zOCX8zO83B9/mVAek7aXdAiaTqN48gmkR1loIPqLpQGawdPAn4btYBMWTZr ZZx7eByzNeolrJhfDYQ1QAAwnFH6shIxt++7Yj/0d4/Em5rwfcpT6szGp0V92P4RLtZas5ulg/6/j 7xBLU9Zw==; 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 1crQ44-0008F2-B6; Fri, 24 Mar 2017 14:19:40 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1crQ3G-0007Fb-Qp for linux-arm-kernel@lists.infradead.org; Fri, 24 Mar 2017 14:18:55 +0000 Received: by mail-wm0-x241.google.com with SMTP id n11so893233wma.0 for ; Fri, 24 Mar 2017 07:18:30 -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=x19+ybbKW3O62v9SbkABogZ3x92gmd6wHTgED+j2qeg=; b=u4Fefamc5+rxRZNUXoDq9jUOJqp6a2v+q7Lm5utycHoe6JlVzIDrhz6WehxrWT66RV 9ELM6+HAHqa27/8wbQYTix/yvGqDkoMOXZkgEy4FEFIolcSV6xSwp2DUCTU6Vbj5OmQd B/myC5zD4+njBghw9jtnpS95IuYKzxTziq20hzOJxl6AbdV4BbQTPB1GGz/69FAt7mri 8Ffuw85WyQLYKTb/HFNFtA691n3AVwQrzZrro8w3mxr+clZtZhdXqR2BV3OEvoBfjEUM s+0H+29BSP1Y1ENjK9tRaIiy2eTsO1dMfNsDp3v1DpJVNgHyuggtTIKIpUUdOxVZKlEC 0Kfg== 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=x19+ybbKW3O62v9SbkABogZ3x92gmd6wHTgED+j2qeg=; b=qppbcra8kEtZaP/RWjH1LCNreGwQ+W+c5JgZVWMS4IGv+1D5coMgqwBYZiQ3v7IR5S tNuQZTnm8WC5Yv+sZW7Wy9MlbKFldWusWjs40atE/x3vVrjkxbwKdXDv8YULBzb4kN+F oudeHEvNCpQHq9F7mbW8N51R4A2rizAFV1v4J713kvM6qVMt0ofcN6nU6jZpm4XiINL7 Txa7o4n31jT/3/Bxp8/rVHmSF33rS7iSoI5vZfg04G9iPJsz8+a/yQgZUsoRGHyz+zYm hkhzLbx8j4KvWjyTgwe7ol4khJsutZ9khbuupnmrIt0nhbL6Nc3sD/J7vqvxJqiXHAV4 McvQ== X-Gm-Message-State: AFeK/H1W7AGdmjJTbF59Aikn1N4li47GXwVetAB1p1iKrnEQUUe4Wahl9uMFBnP6TkpQEQ== X-Received: by 10.28.224.69 with SMTP id x66mr3275062wmg.21.1490365108828; Fri, 24 Mar 2017 07:18:28 -0700 (PDT) Received: from localhost.lan ([37.209.189.139]) by smtp.googlemail.com with ESMTPSA id b13sm2638780wmf.6.2017.03.24.07.18.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Mar 2017 07:18:27 -0700 (PDT) From: Ralph Sennhauser To: linux-gpio@vger.kernel.org Subject: [PATCH v3 2/4] mvebu: xp: Add PWM properties to .dtsi files Date: Fri, 24 Mar 2017 15:18:12 +0100 Message-Id: <20170324141815.7252-3-ralph.sennhauser@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170324141815.7252-1-ralph.sennhauser@gmail.com> References: <20170324141815.7252-1-ralph.sennhauser@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170324_071851_239470_571C93DC X-CRM114-Status: GOOD ( 11.30 ) 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 , Linus Walleij , Russell King , Rob Herring , linux-kernel@vger.kernel.org, Gregory Clement , devicetree@vger.kernel.org, Thierry Reding , linux-pwm@vger.kernel.org, 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 #pwm-cells = <1> * 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 | 10 ++++++++-- arch/arm/boot/dts/armada-xp-mv78230.dtsi | 10 ++++++++-- arch/arm/boot/dts/armada-xp-mv78260.dtsi | 10 ++++++++-- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 10 ++++++++-- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index cc011c8..de7295c 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -138,24 +138,30 @@ gpio0: gpio@18100 { compatible = "marvell,orion-gpio"; - reg = <0x18100 0x40>; + reg = <0x18100 0x40>, <0x181c0 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <1>; interrupt-controller; #interrupt-cells = <2>; interrupts = <82>, <83>, <84>, <85>; + clocks = <&coreclk 0>; }; gpio1: gpio@18140 { compatible = "marvell,orion-gpio"; - reg = <0x18140 0x40>; + reg = <0x18140 0x40>, <0x181c8 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <1>; interrupt-controller; #interrupt-cells = <2>; interrupts = <87>, <88>, <89>, <90>; + clocks = <&coreclk 0>; }; gpio2: gpio@18180 { diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index 07c5090..9ae856b 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi @@ -203,24 +203,30 @@ internal-regs { gpio0: gpio@18100 { compatible = "marvell,orion-gpio"; - reg = <0x18100 0x40>; + reg = <0x18100 0x40>, <0x181c0 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <1>; interrupt-controller; #interrupt-cells = <2>; interrupts = <82>, <83>, <84>, <85>; + clocks = <&coreclk 0>; }; gpio1: gpio@18140 { compatible = "marvell,orion-gpio"; - reg = <0x18140 0x40>; + reg = <0x18140 0x40>, <0x181c8 0x08>; + reg-names = "gpio", "pwm"; ngpios = <17>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <1>; 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..11eb6ff 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi @@ -286,24 +286,30 @@ internal-regs { gpio0: gpio@18100 { compatible = "marvell,orion-gpio"; - reg = <0x18100 0x40>; + reg = <0x18100 0x40>, <0x181c0 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <1>; interrupt-controller; #interrupt-cells = <2>; interrupts = <82>, <83>, <84>, <85>; + clocks = <&coreclk 0>; }; gpio1: gpio@18140 { compatible = "marvell,orion-gpio"; - reg = <0x18140 0x40>; + reg = <0x18140 0x40>, <0x181c8 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <1>; interrupt-controller; #interrupt-cells = <2>; interrupts = <87>, <88>, <89>, <90>; + clocks = <&coreclk 0>; }; gpio2: gpio@18180 { diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index d1383dd..597b0d6 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi @@ -324,24 +324,30 @@ internal-regs { gpio0: gpio@18100 { compatible = "marvell,orion-gpio"; - reg = <0x18100 0x40>; + reg = <0x18100 0x40>, <0x181c0 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <1>; interrupt-controller; #interrupt-cells = <2>; interrupts = <82>, <83>, <84>, <85>; + clocks = <&coreclk 0>; }; gpio1: gpio@18140 { compatible = "marvell,orion-gpio"; - reg = <0x18140 0x40>; + reg = <0x18140 0x40>, <0x181c8 0x08>; + reg-names = "gpio", "pwm"; ngpios = <32>; gpio-controller; #gpio-cells = <2>; + #pwm-cells = <1>; interrupt-controller; #interrupt-cells = <2>; interrupts = <87>, <88>, <89>, <90>; + clocks = <&coreclk 0>; }; gpio2: gpio@18180 {