From patchwork Tue Oct 7 21:32:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamino Galvani X-Patchwork-Id: 5049451 Return-Path: X-Original-To: patchwork-linux-arm@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 B084DC11AB for ; Tue, 7 Oct 2014 21:37:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9AB99201F7 for ; Tue, 7 Oct 2014 21:37:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9C142201F4 for ; Tue, 7 Oct 2014 21:37:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XbcQ5-0005Pu-Vb; Tue, 07 Oct 2014 21:35:45 +0000 Received: from mail-wg0-x22a.google.com ([2a00:1450:400c:c00::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XbcPa-0003Ns-Qy for linux-arm-kernel@lists.infradead.org; Tue, 07 Oct 2014 21:35:15 +0000 Received: by mail-wg0-f42.google.com with SMTP id z12so10345313wgg.25 for ; Tue, 07 Oct 2014 14:34:52 -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=IBcgvE1suqgXAyjpKpgTL1PHq5UeJ9P2u757/+OILlU=; b=pQ1CyW4WTd9J0td5NS6G9Rz6VdeHLsMhCixaYjef3kDOwJwiaSLhTvTGSTPLhsVLH2 OptVRk94ATADccJonxGKC6G7QNH3soTl0xBKlHPCXqlTaBkjmZncHuVAo/lBvTRIHau8 h2OT4eX9rogDT01OWoXwvQpoCd3YkVMsoeFt4AvewjvWb8hCidcHdqjwZ5MaZ4T/O8zo UXlEO0Dbw18RyFWhrTQOvt53WkOHpwZAsu1YmXPWM03ivBG0snILdui5IrvS5jaFDiCq n9jZH/WV93TcgFkT6q+G5eF4eqS1BGXCkvjNXcUV0/VrmugQUeP9JWs3bWswBfYOCdMO j1HA== X-Received: by 10.180.208.13 with SMTP id ma13mr7504558wic.53.1412717692856; Tue, 07 Oct 2014 14:34:52 -0700 (PDT) Received: from sark.local (host207-98-dynamic.16-79-r.retail.telecomitalia.it. [79.16.98.207]) by mx.google.com with ESMTPSA id cw6sm22244820wjb.18.2014.10.07.14.34.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Oct 2014 14:34:52 -0700 (PDT) From: Beniamino Galvani To: Linus Walleij Subject: [PATCH 3/3] ARM: dts: meson8: add pinctrl and gpio nodes Date: Tue, 7 Oct 2014 23:32:56 +0200 Message-Id: <1412717576-19737-4-git-send-email-b.galvani@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412717576-19737-1-git-send-email-b.galvani@gmail.com> References: <1412717576-19737-1-git-send-email-b.galvani@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141007_143515_043222_37D98AE7 X-CRM114-Status: GOOD ( 11.57 ) X-Spam-Score: -0.8 (/) Cc: Mark Rutland , devicetree@vger.kernel.org, Victor Wan , Russell King , Pawel Moll , Arnd Bergmann , Ian Campbell , linux-kernel@vger.kernel.org, Beniamino Galvani , Rob Herring , Kumar Gala , Carlo Caione , Jerry Cao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 Add pinctrl node to meson8.dtsi and gpio-leds node to meson8-vega-s89e.dts Signed-off-by: Beniamino Galvani --- arch/arm/boot/dts/meson8-vega-s89e.dts | 16 +++++++++++++++- arch/arm/boot/dts/meson8.dtsi | 35 ++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/meson8-vega-s89e.dts b/arch/arm/boot/dts/meson8-vega-s89e.dts index 950998f..70a05c1 100644 --- a/arch/arm/boot/dts/meson8-vega-s89e.dts +++ b/arch/arm/boot/dts/meson8-vega-s89e.dts @@ -45,7 +45,9 @@ /dts-v1/; -/include/ "meson8.dtsi" +#include "meson8.dtsi" +#include +#include / { model = "Tronsmart Vega S89 Elite"; @@ -58,8 +60,20 @@ memory { reg = <0x40000000 0x80000000>; }; + + gpio-leds { + compatible = "gpio-leds"; + + power { + gpios = <&gpio_ao GPIO_TEST_N GPIO_ACTIVE_LOW>; + linux,default-trigger = "none"; + }; + }; + }; &uart_AO { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart_ao_a>; }; diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index 1f442a7..59c3af0 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -89,4 +89,39 @@ compatible = "fixed-clock"; clock-frequency = <141666666>; }; + + pinctrl: pinctrl@c1109880 { + compatible = "amlogic,meson8-pinctrl"; + reg = <0xc1109880 0x10>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + gpio: banks@c11080b0 { + reg = <0xc11080b0 0x28>, + <0xc11080e4 0x18>, + <0xc1108120 0x18>, + <0xc1108030 0x30>; + reg-names = "mux", "pull-enable", "pull", "gpio"; + gpio-controller; + #gpio-cells = <2>; + }; + + gpio_ao: ao-bank@c1108030 { + reg = <0xc8100014 0x4>, + <0xc810002c 0x4>, + <0xc8100024 0x8>; + reg-names = "mux", "pull", "gpio"; + gpio-controller; + #gpio-cells = <2>; + }; + + uart_ao_a: uart_ao_a { + uart_ao_a { + pins = "uart_tx_ao_a", "uart_rx_ao_a"; + function = "uart_ao"; + }; + }; + }; + }; /* end of / */