From patchwork Thu Mar 16 06:42:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralph Sennhauser X-Patchwork-Id: 9627345 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 3EFFC6048C for ; Thu, 16 Mar 2017 06:43:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EC6D27F10 for ; Thu, 16 Mar 2017 06:43:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 211C428637; Thu, 16 Mar 2017 06:43:32 +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 8C63827F10 for ; Thu, 16 Mar 2017 06:43:31 +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=pNyPzseldRMzD6ir4FN+f6FI/bK+2UCCfY3ZaR+b2Y4=; b=tSDQXwpE5y6dyLCjC2wtIM6i2U NceC0vo+Os/vMSVYztoxO1X1oEOJYyOmNi6CyGPIXOdtYY0i+sWsQqSksaTc/vRWCXoNmn37zPZFO nHUx07pkRUa3ZzgevmcoMbr/UMhF6DuYrHdjkweFY+wZ1WL4HVdzdAbGaqpb95zdt3rd00NspRzK9 CnN0VBGOrw+R0K3PV5YHT6N6k4V9viQoYWY7kcMYa/aG3KHEDKBb9e9FrA/Kc1BfO58LM7g+7uaU1 e/liDJKIEyPMhwlw5+0AyssU2AHUkvo0rgePonUTebQnsoksv6C+WAYHzpqaTMHnGYGiFVwGdq2JI TQSjeEwQ==; 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 1coP8F-00044O-6u; Thu, 16 Mar 2017 06:43:31 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1coP8B-00042k-Cq for linux-arm-kernel@lists.infradead.org; Thu, 16 Mar 2017 06:43:29 +0000 Received: by mail-wm0-x243.google.com with SMTP id n11so8005506wma.0 for ; Wed, 15 Mar 2017 23:43:05 -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=/kKgGELFdpqGm1z1XNHQT/WksAWbDzAHHP93J6jALQk=; b=S+uV+k0bgMNk+T6/HmE7tVGvHKPWrxkaNO9ONZ/Es3UnlLut6cINQwkj64Fs4QoQgc L8l6pSBMspecvThl02biH3yTaeIn8ddqbhhbPAMB3o7Wjf8ABXJZ7hpO5vIL+GuvBzBK 3YvgB/yqlUNfyDeXIwX30xpVu9K5eIz07ddTTZjdcHHs7MoYu1lgvBfRevpJ+NiQw6FR /CivORlRX0JLfAUHP3xtep2/PKzOr1fTJ5Z63+/RTsMvKLr+j81XFKNAPjhrS1kAseIs iPB6yVPG6TODVIyRs18EYE/UMyixl0Z8corEuFk6cgVOaIiZi88yaOSNq2CD80Eh8y8Q 5o7A== 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=/kKgGELFdpqGm1z1XNHQT/WksAWbDzAHHP93J6jALQk=; b=aYV9eds+RTem+Sa3VBqEm6kI8C789D+hKnW6tejetTF0PiRvqFFrU9cDO1pfQCJys3 x5sd1ZjeWjwOFrrgd5rPG5OvTQLjRkK2YugOse1Q0oZSAcPF0T1G7CzhdxoYMWpeAYfJ r6MFjZ03uTV1w6JPWc9n1GHTFHFelpPDxxCG0k6+cIrKQ/5sji5M6AbehFluQcKZshxG 4/Y1UYXi28IiViz7UTMWfmTxZRS1ZZRESX/OGupWvmeBsY+pVsKzxUpPGLtHq14O5bT+ OvkfqrWOlrWM6+CMmrgMlchyxQp5UyiTjSuGDMICaZTd2zYKXmsyudM8WYue9zlZWHDT WNzA== X-Gm-Message-State: AFeK/H0lNE1xg6pB9ASrV66+xEKBGcmfdMTS7nhQlF7kiJ6uEqK7YrrBNPAL2nmAiNrOrw== X-Received: by 10.28.173.193 with SMTP id w184mr7879569wme.106.1489646583808; Wed, 15 Mar 2017 23:43:03 -0700 (PDT) Received: from localhost.lan ([37.209.189.139]) by smtp.googlemail.com with ESMTPSA id o63sm3039825wmo.30.2017.03.15.23.43.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Mar 2017 23:43:02 -0700 (PDT) From: Ralph Sennhauser To: linux-gpio@vger.kernel.org Subject: [PATCH 2/4] mvebu: xp: Add pwm properties to .dtsi files Date: Thu, 16 Mar 2017 07:42:16 +0100 Message-Id: <20170316064218.9169-3-ralph.sennhauser@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170316064218.9169-1-ralph.sennhauser@gmail.com> References: <20170316064218.9169-1-ralph.sennhauser@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170315_234327_621309_4E8230D1 X-CRM114-Status: GOOD ( 11.35 ) 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 , "open list:PWM SUBSYSTEM" , open list , Gregory Clement , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Rob Herring , Thierry Reding , Ralph Sennhauser , Imre Kaloz , "moderated list:ARM/Marvell Kirkwood and Armada 370, 375, 38x, ..." , 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/ 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 | 8 ++++++-- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 10 ++++++++-- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index cc011c8..aa9fe72 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 = <2>; 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 = <2>; 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..fc3934f 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 = <2>; 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 = <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..04dda6a 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi @@ -286,24 +286,28 @@ 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 = <2>; 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>; ngpios = <32>; gpio-controller; #gpio-cells = <2>; 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..fb6d28a 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 = <2>; 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 = <2>; interrupt-controller; #interrupt-cells = <2>; interrupts = <87>, <88>, <89>, <90>; + clocks = <&coreclk 0>; }; gpio2: gpio@18180 {