From patchwork Thu Mar 7 15:13:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10843121 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 23FD81669 for ; Thu, 7 Mar 2019 15:15:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0ADAA2E2E1 for ; Thu, 7 Mar 2019 15:15:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1F8A2F339; Thu, 7 Mar 2019 15:15:10 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 97E762E2E1 for ; Thu, 7 Mar 2019 15:15:10 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=0VreKBHnPStjhlPEp3DpguErrh/pPp17WqW/CdxTrww=; b=LYO8yGMmCPjK7k S0b/vR5v+iflKljvlQFNYDALUQUT4mNNDbge6RrlvfAvuLGt6lLZQDGhsi7hMhBnV0pYIL7Yh+lRH OW28yHfK5aoKct+K9CRjzR2z6yEQZHrmvP2fkUFj/2D623WnJmDeYd46panMhShyVKuV1+wV5/RTR zCgxps9DO+tpl5qpvNAZJ4xBS/gWq3Nxv0Ia6JHtq3t9YupDSjGED3dyoPmOwfcTwr/ZG2UsD+mBV WNN/wfMm8js2gDJe7T4oc3h8bS1tHAvfS5MRCH8TgbRe2zsIip4Jp0XTwIvwEAK3b/sn8+V4DK8MA WR8kDKYYWOm/W+tkmcKw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1ujj-0005CO-Vz; Thu, 07 Mar 2019 15:15:08 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1uiS-0003R9-IR for linux-arm-kernel@lists.infradead.org; Thu, 07 Mar 2019 15:13:52 +0000 Received: by mail-wr1-x443.google.com with SMTP id t18so17871376wrx.2 for ; Thu, 07 Mar 2019 07:13:48 -0800 (PST) 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=pTKXutykj7vwY0VfsJAxh3ulcw4nav4DaRakY0rdQgM=; b=x05kA46l6Ub4SgMg1oVMBKRlw00P7ZOno653ZCbKjWvjaDW16/H9sw2Dll+a2S1WJG nay07eixuRsFC7gSdhiytqqDHI1n7wNlZGm5NIeeTOg2oCywv1YYaZFp2ifDLZg0GZJf HHLcrrgpjniUmnTKjbHYO7541ksgK5V7UzI9BdLl3+T6PpbtDT13uk4qkrkvqKpZXLTe CeRHB58iXswzThnyVz24DkXSDsDAHXYAerJyFmkeAeS5BalCu1Gfwu4tyYFzZQqsanzl cw7Y1aaea2Py1muGyTOapWwmBWgxOWZQnGabDE+e3xOagxNMBJaNdbvLkm/G3sOC9Tsz KBYw== 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:mime-version:content-transfer-encoding; bh=pTKXutykj7vwY0VfsJAxh3ulcw4nav4DaRakY0rdQgM=; b=BX9Mevxt6SL/gdp/vQfBKCOkQMNVwvrH3e/5aEpqnBVRv034X1K+DyZ9HaYqNmjMDB es/4o71oCH6Pm2aekc2EvGwgZzK8fkpTmpIH9h1VfGLSftRQtdfUjFcM/vNDU2XcXeZ1 aaplkpdhrwRzaQGWMCpuwMjHOAlxy4zk59YojwehnySR7QRCfhbD4RAbD8RmC9rYX0s7 DGtkhvUin8U5wn2Cv1pFfLGBVDOZPlMp34ZBGZDIB9cp/LZY1ltIHRjosXKziuvOjK3M B9RfROhV2vN4d/QeywR7Wr7Zaedy6gpjjYdZCbIXGEVWZBF4/YP0MlqVEX5tSeXVFl// 5Ktw== X-Gm-Message-State: APjAAAW6Q9etPSUkI/5f9ZnIouucjUIiYYYQufMq/LioATh1iJH5XQ4S j3K0ZCIxrU45mptT1PBMn/730w== X-Google-Smtp-Source: APXvYqzrBJHweFCZ+0W1kt+i0Xl1xJ7WPNLiGJgYkl9B+D0E4iAQkHB6LHd2tmZvp6+b3Fxkei0iVw== X-Received: by 2002:adf:cd04:: with SMTP id w4mr7310512wrm.25.1551971627071; Thu, 07 Mar 2019 07:13:47 -0800 (PST) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id r15sm5756563wrt.37.2019.03.07.07.13.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Mar 2019 07:13:46 -0800 (PST) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 4/9] arm64: dts: meson: g12a: add uart_ao_a pinctrl Date: Thu, 7 Mar 2019 16:13:36 +0100 Message-Id: <20190307151342.7381-5-narmstrong@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190307151342.7381-1-narmstrong@baylibre.com> References: <20190307151342.7381-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190307_071348_609545_2477CA82 X-CRM114-Status: GOOD ( 12.13 ) 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: linux-amlogic@lists.infradead.org, Neil Armstrong , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet 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: Jerome Brunet Add the always on UART pinctrl setting to the g12a soc DT and use it for the u200 reference design Signed-off-by: Jerome Brunet Signed-off-by: Neil Armstrong --- .../arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 ++ arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts index c44dbdddf2cf..f2afd0bf3e28 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -25,5 +25,7 @@ &uart_AO { status = "okay"; + pinctrl-0 = <&uart_ao_a_pins>; + pinctrl-names = "default"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index c141cc7f6b09..f8f055c49f9a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -177,6 +177,24 @@ #gpio-cells = <2>; gpio-ranges = <&ao_pinctrl 0 0 15>; }; + + uart_ao_a_pins: uart_a_ao { + mux { + groups = "uart_ao_a_tx", + "uart_ao_a_rx"; + function = "uart_ao_a"; + bias-disable; + }; + }; + + uart_ao_a_cts_rts_pins: uart_ao_a_cts_rts { + mux { + groups = "uart_ao_a_cts", + "uart_ao_a_rts"; + function = "uart_ao_a"; + bias-disable; + }; + }; }; };