From patchwork Fri May 6 14:21:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 9033661 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 727EDBF29F for ; Fri, 6 May 2016 14:24:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8449720381 for ; Fri, 6 May 2016 14:24:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8E0E2200F0 for ; Fri, 6 May 2016 14:24:11 +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 1aygeY-0008Ej-OL; Fri, 06 May 2016 14:22:50 +0000 Received: from mail-pf0-x22f.google.com ([2607:f8b0:400e:c00::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aygde-0007XD-5n for linux-arm-kernel@lists.infradead.org; Fri, 06 May 2016 14:21:55 +0000 Received: by mail-pf0-x22f.google.com with SMTP id 77so50231530pfv.2 for ; Fri, 06 May 2016 07:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zskhtvlr2lPNC0BssP4UuYK0q3QISlgl5e4X5x1HDag=; b=ikdUSqhLTleOyK70vn7TV79YYAmXom+Fb4xPjuH2OK20hrg73flZnyHWg0iH0t7Azf CjjAe7aUdqX7w1s9KKAsuESJE1709fZZKDriazK3qZZpKZK3pupOi+J+Ud8BvHID21yE 9xbs+0re4BZZtiqgTngrij2m1F0sgpaVQo5/f6UKadHiO/2KfkbaA+i/5ErmggWpD4Oy mlqG1J8RAeqMqc1Irx5oKW+3F9Xs/jTsjCNC6ozCwthj1zOEwgqpwRvQvH3Gx1Ypzpvv KQNGgZP1pmNvTVp7wCRWVODOqs/YDnZGL+ZQoP/KleRz77lFcBjboM1Rfucf1qS57A5g Pl3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zskhtvlr2lPNC0BssP4UuYK0q3QISlgl5e4X5x1HDag=; b=kDwxoPTBNRrwwBsChUweofrViTwulzqnk0qAwcJ/251hd9uxoDRALZwi/ywq25FvQz lTTVRXBVFTcU9LWUzUjl9e9oRvGzlCXeOqnlJEiZJ6QcjJM4XptHP+0ERn9LIkm0NGDk +TWQkHrV1759pFMhVaSUgmh4btKDwpaxsCINrVEmAcw158HbwGmu+9SWdyxKKu8E5WsO S1XynYd1Uf9nA2MVJijr1lsfpRu2KAEqCkSBEeSDIhkX5J/SA3Ihs59JJNxwDate9zHv EDIXFl38/5+u5zLRdLu7JCGvCiiJJ79h4vTuOV/hvZD2WkBkAAjf2dVtE/uA9kQwuf+h vMNg== X-Gm-Message-State: AOPr4FVLUIWamwzlzv7y5TKWUF2vKkBLICZPldSgLodxqFjTXDJ2ccITL9VsIU8Sl73o4ixT X-Received: by 10.98.79.199 with SMTP id f68mr29463399pfj.44.1462544493410; Fri, 06 May 2016 07:21:33 -0700 (PDT) Received: from localhost (c-98-203-232-209.hsd1.wa.comcast.net. [98.203.232.209]) by smtp.gmail.com with ESMTPSA id 28sm21563661pfs.1.2016.05.06.07.21.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 May 2016 07:21:32 -0700 (PDT) From: Kevin Hilman To: linux-amlogic@lists.infradead.org, Carlo Caione , Linus Walleij Subject: [PATCH 6/7] ARM64: dts: amlogic: gxbb: pinctrl: add/update UART Date: Fri, 6 May 2016 07:21:25 -0700 Message-Id: <1462544486-9516-7-git-send-email-khilman@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462544486-9516-1-git-send-email-khilman@baylibre.com> References: <1462544486-9516-1-git-send-email-khilman@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160506_072154_463333_F88898D7 X-CRM114-Status: GOOD ( 10.91 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xing Wu , Victor Wan , linux-meson@googlegroups.com, linux-gpio@vger.kernel.org, Jerry Cao , =?UTF-8?q?Andreas=20F=C3=A4rber?= , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-6.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 DT nodes for additional UARTs (UART B & C in EE domain) and add pins for all EE domain UARTs. Signed-off-by: Kevin Hilman --- .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 1 + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 42 +++++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts index 41e1e669bc70..45778896bd3d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -80,3 +80,4 @@ pinctrl-0 = <&uart_ao_a_pins>; pinctrl-names = "default"; }; + diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 7b22b9d3b9d9..86c41b3798db 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -132,11 +132,27 @@ uart_A: serial@84c0 { compatible = "amlogic,meson-uart"; - reg = <0x0 0x084c0 0x0 0x14>; + reg = <0x0 0x84c0 0x0 0x14>; interrupts = ; clocks = <&xtal>; status = "disabled"; }; + + uart_B: serial@84dc { + compatible = "amlogic,meson-uart"; + reg = <0x0 0x84dc 0x0 0x14>; + interrupts = ; + clocks = <&xtal>; + status = "disabled"; + }; + + uart_C: serial@8700 { + compatible = "amlogic,meson-uart"; + reg = <0x0 0x8700 0x0 0x14>; + interrupts = ; + clocks = <&xtal>; + status = "disabled"; + }; }; gic: interrupt-controller@c4301000 { @@ -234,6 +250,30 @@ function = "sdcard"; }; }; + + uart_a_pins: uart_a { + mux { + groups = "uart_tx_a", + "uart_rx_a"; + function = "uart_a"; + }; + }; + + uart_b_pins: uart_b { + mux { + groups = "uart_tx_b", + "uart_rx_b"; + function = "uart_b"; + }; + }; + + uart_c_pins: uart_c { + mux { + groups = "uart_tx_c", + "uart_rx_c"; + function = "uart_c"; + }; + }; }; };