From patchwork Sun Jan 15 22:20:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9517893 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 A810B601C3 for ; Sun, 15 Jan 2017 22:21:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7880B205D6 for ; Sun, 15 Jan 2017 22:21:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D460205FB; Sun, 15 Jan 2017 22:21:34 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 23E8D205D6 for ; Sun, 15 Jan 2017 22:21:34 +0000 (UTC) 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 1cStAz-0005Kv-AI; Sun, 15 Jan 2017 22:21:25 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cStAu-0005Ig-Gi; Sun, 15 Jan 2017 22:21:22 +0000 Received: by mail-wm0-x244.google.com with SMTP id c85so26458662wmi.1; Sun, 15 Jan 2017 14:21:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RuMlT3mYlTXQGoa0/TilBtoHO4Tm3oryAdtDSmR6zxc=; b=SldvWRWIDOEU+f/LYiIUCqq0eXz4lhhtmgmVKW9XsUzFWXPO9WjQngbDCDVsNqNxd5 m2HR28oHaYPuUa1WeLGhZONirDhP03rGQ6v/RgiDSlp539QV6n7CCWfQFCotkE4tSmlG EXaNe/ro+KCH0IZujTZZhu2OsldDxPMbCXHVQTSGPaAI9CdL6pYqdpupIg+k1m4gOoLk tuSvNzpHNLvvLpWoeI/mYT4nit5z8PuQqJR6YWMvclWFC7yjbJ1VQ+SwYDwc7/wQ+1ND VRr9fuvbBTPK9QTm8K1Ve79QIbVIAQtA5Em3vfDniwdnMKbV1ynl9+mg4rWJ8Cpjg8GG ssPA== 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=RuMlT3mYlTXQGoa0/TilBtoHO4Tm3oryAdtDSmR6zxc=; b=ttisj2JgEJi3lxMeISvSC8AoeAMDsUPWP+XROLF+kLwc0hokzVEpfZE1/qSu5kH/ow RQVh83v4Gum2BrHV/DYiN4pPCOfMAZQfPIJkqzhwhhOIHj1NBP7Ab8ae4fPwMv63I2fj 3FEShjw+IuVGnKCYE3Olp591ok7KQ+N5Wzoda35pSxRqO0RiDawatsfjiW4PtEQBiRDk PLA9CfhwKnrESJ6qhxcbtjIwc+b+5VVvnwjG7aY7wB4yMgFm/uaosW8XiA+1DAnZqJ6Q ZC8nmXxCzHvxhLj7L/i1Qu16ebw3PaOYNtiIdiHpC8QyOqD6U6ok+QikcOtJhgTLrX/d gFQQ== X-Gm-Message-State: AIkVDXJscHigAS+3qXnmBZvB5Wn0rxEOwW0Bpx/sWrkh3voVHyn1UoCYqvrkvplTh8C8Gw== X-Received: by 10.223.175.49 with SMTP id z46mr5823731wrc.84.1484518861015; Sun, 15 Jan 2017 14:21:01 -0800 (PST) Received: from blackbox.darklights.net (p5DE38740.dip0.t-ipconnect.de. [93.227.135.64]) by smtp.googlemail.com with ESMTPSA id c132sm18502018wme.21.2017.01.15.14.20.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Jan 2017 14:21:00 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, linux-gpio@vger.kernel.org, linus.walleij@linaro.org, khilman@baylibre.com Subject: [PATCH 2/2] ARM64: dts: meson-gx: add the missing uart_AO_B Date: Sun, 15 Jan 2017 23:20:29 +0100 Message-Id: <20170115222029.8271-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170115222029.8271-1-martin.blumenstingl@googlemail.com> References: <20170115222029.8271-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170115_142120_724883_85AA1915 X-CRM114-Status: UNSURE ( 9.53 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@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@arm.com, devicetree@vger.kernel.org, Martin Blumenstingl , catalin.marinas@arm.com, will.deacon@arm.com, robh+dt@kernel.org, carlo@caione.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This adds the missing node for the uart_AO_B port to the meson-gx.dtsi (as this is supported by GXBB, GXL and GXM) along with the required pinctrl pins. This is required as some boards are using it (the boards from the Khadas VIM series for example have it exposed on the pin headers). Signed-off-by: Martin Blumenstingl Acked-by: Linus Walleij --- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 8 ++++++++ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 7 +++++++ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index cddad8c795ec..5ece505dca71 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -324,6 +324,14 @@ status = "disabled"; }; + uart_AO_B: serial@4e0 { + compatible = "amlogic,meson-uart"; + reg = <0x0 0x004e0 0x0 0x14>; + interrupts = ; + clocks = <&xtal>; + status = "disabled"; + }; + ir: ir@580 { compatible = "amlogic,meson-gxbb-ir"; reg = <0x0 0x00580 0x0 0x40>; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 5d686334f692..474435e21759 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -138,6 +138,13 @@ }; }; + uart_ao_b_pins: uart_ao_b { + mux { + groups = "uart_tx_ao_b", "uart_rx_ao_b"; + function = "uart_ao_b"; + }; + }; + remote_input_ao_pins: remote_input_ao { mux { groups = "remote_input_ao"; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index bb2842f8a08f..53ed7a5f50ab 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -82,6 +82,13 @@ }; }; + uart_ao_b_pins: uart_ao_b { + mux { + groups = "uart_tx_ao_b", "uart_rx_ao_b"; + function = "uart_ao_b"; + }; + }; + remote_input_ao_pins: remote_input_ao { mux { groups = "remote_input_ao";