From patchwork Thu Jan 17 10:31:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10767885 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 17AC191E for ; Thu, 17 Jan 2019 10:32:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06DAD29C85 for ; Thu, 17 Jan 2019 10:32:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF8512EB2D; Thu, 17 Jan 2019 10:32:06 +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 9246129C85 for ; Thu, 17 Jan 2019 10:32:06 +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=U/owgTn1+1mlY1ieaGYOZ9X5SCHvz8MRtZ8fY6X0Q1g=; b=OuPvUYGoMR9rjK iYyQXrFI3psa+dw2boNfHhpZPdU5Ra+ET9vubYPjeztZJRE0u8ZQHWjmBTKi0M2QARKk9L23Yybhl bGsFnxT6J/4hsDDkKmH7E3alPr8PZZ3S7duVPBqgKx2J+hPlK4Kbynhhv0CB/KycstGS8mt05k177 0+V+cUyJArOPOMnC0SBhdEUpOgIB3bYGfb2axsx7/xik3XOcaSuKV07iB3RmoIa2ePG34xJzB7a2V p7gLThcLzq3HEREEM6GNacMCMwswaEDhQdO9vOz/Wr7Y1ihu03zWgD0mu6WXlPrvTNPcZ+WJ4kcXA Lc66D4M70z4KaUZhawQw==; 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 1gk4xx-0000Wl-9F; Thu, 17 Jan 2019 10:32:05 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gk4xt-0000U6-0y for linux-amlogic@lists.infradead.org; Thu, 17 Jan 2019 10:32:02 +0000 Received: by mail-wr1-x442.google.com with SMTP id 96so10408348wrb.2 for ; Thu, 17 Jan 2019 02:32:00 -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=59lSFWiKXUet4YBV9ctjDOXoipeUSkvqSc4ERhu10Hk=; b=Bqj58vkKOyRYZCoMa5TrckC29HjEgfW6Ls+PRJ/0QM4b22jpGTvgdFOA2HS+Id4y3c C1shCH1rHGsIpweCdGhNZetg5vXVVh/3Zr8I9h8Xo3nVJFDh48k3LGZA0gX5gXLuv/sn B2piQrauOXroZ74Tq5FuzpCPNMv7mge0L1kauNPUU1iZjBVuuiYc0ltDoCNReSRcKeFo uCg9JMsSDIjAyTUxbOYaKlzr9RWdyJpS1OSXHc3yMRBXwhTaTnjdwO+Sg2C983QcXWk2 FvHfNm98G/qmRnPQyR11XtRl3Cvsu0WoczXM0gT8wEQT5rsnax5C6cmEyVzC/Bnq0scg yANA== 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=59lSFWiKXUet4YBV9ctjDOXoipeUSkvqSc4ERhu10Hk=; b=uIFBQsCs2vL0mpK0FzZcKeR1hcOgQmaqP3TZd7PsO2kDIMtXJcg3yKUXUgISeOzr/f Q0uYlqaP7rAGre5/90SfWlA2tEj5t9QYbHfKyw+lmhiV2m6PgX8P5/2EkRtEg6CFidzK tYMtSZUh5mYExbgtBPGall68c+ufAzeaVJWH0fqtPa1ATRqTocFOJRxX0neyWWJyTN2z z3dmUOWeKvMF9jZ2YxB0Dly6yqdVfFS9XI/IZC4mIoUKM6dlGuq1iUIiv69xg49kbpQ+ bCFkZtvcrgVuCNWnxpCXEiqyCnJn6d8e9WsdHkbQOS5woDSfYNcwNMdwzvmEklf/ZJPR MprQ== X-Gm-Message-State: AJcUukcoVkEN/YCSRUUt7o3R6RDgrx38IJ/Zl2Of26lIGbQbu6wkC4iO mP9KuwOl1lcvv/GZqSoQHd14wQ== X-Google-Smtp-Source: ALg8bN7s5VbZn0Sj44pkmrn8b87kVUa+xpO0SLvjkz+eDt0L3Y83kMydB5RFWeXiNPPeVFe/8+FvNg== X-Received: by 2002:adf:8143:: with SMTP id 61mr10995914wrm.47.1547721119612; Thu, 17 Jan 2019 02:31:59 -0800 (PST) Received: from boomer.local ([2a01:e34:eeb6:4690:106b:bae3:31ed:7561]) by smtp.googlemail.com with ESMTPSA id 143sm77658107wml.14.2019.01.17.02.31.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Jan 2019 02:31:59 -0800 (PST) From: Jerome Brunet To: Kevin Hilman Subject: [PATCH 1/2] arm64: dts: meson: g12a: add pinctrl support controllers Date: Thu, 17 Jan 2019 11:31:50 +0100 Message-Id: <20190117103151.3349-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190117103151.3349-1-jbrunet@baylibre.com> References: <20190117103151.3349-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190117_023201_064613_67FC299A X-CRM114-Status: UNSURE ( 8.89 ) 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: linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, patchwork-bot+notify@kernel.org, linux-kernel@vger.kernel.org, Jerome Brunet Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add the peripheral and always-on pinctrl controllers to the g12a soc. Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 49 +++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index 2aea5ba62fee..39ad2bbaa162 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -84,6 +84,29 @@ #address-cells = <2>; #size-cells = <2>; ranges = <0x0 0x0 0x0 0xff634400 0x0 0x400>; + + periphs_pinctrl: pinctrl@40 { + compatible = "amlogic,meson-g12a-periphs-pinctrl"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + gpio: bank@40 { + reg = <0x0 0x40 0x0 0x4c>, + <0x0 0xe8 0x0 0x18>, + <0x0 0x120 0x0 0x18>, + <0x0 0x2c0 0x0 0x40>, + <0x0 0x340 0x0 0x1c>; + reg-names = "gpio", + "pull", + "pull-enable", + "mux", + "ds"; + gpio-controller; + #gpio-cells = <2>; + }; + + }; }; hiu: bus@ff63c000 { @@ -94,6 +117,32 @@ ranges = <0x0 0x0 0x0 0xff63c000 0x0 0x1400>; }; + rti: bus@ff800000 { + compatible = "simple-bus"; + reg = <0x0 0xff800000 0x0 0x1000>; + #address-cells = <2>; + #size-cells = <2>; + ranges = <0x0 0x0 0x0 0xff800000 0x0 0x1000>; + + ao_pinctrl: pinctrl@14 { + compatible = "amlogic,meson-g12a-aobus-pinctrl"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + gpio_ao: bank@14 { + reg = <0x0 0x14 0x0 0x8>, + <0x0 0x1c 0x0 0x8>, + <0x0 0x24 0x0 0x14>; + reg-names = "mux", + "ds", + "gpio"; + gpio-controller; + #gpio-cells = <2>; + }; + }; + }; + uart_AO: serial@ff803000 { compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart"; From patchwork Thu Jan 17 10:31:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 10767887 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 93D5B14E5 for ; Thu, 17 Jan 2019 10:32:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8271E29C85 for ; Thu, 17 Jan 2019 10:32:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 767882EB2D; Thu, 17 Jan 2019 10:32:08 +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 2933529C85 for ; Thu, 17 Jan 2019 10:32:08 +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=kJArfMYKyEI2uuRhTUN8r377JLZGLk9bIgKFTGrzjr0=; b=FDpggOrpVrlwci 9pUmn+kZOqtc05p/e+nNTfDMGtFgRdJpAsqH4MiWQHIsXFGZ8xWyWkmNGGwcyRhF0SPU6dPoxczN8 UcREWeBBo9Ue9CD/pwx1vbisgv9ezhgVJwp8ZPxf3ZUwbb2TNyaUGThGkvw1j3DuUlbtafx92uoLS iqwJvHkEv9cwRwpIGqvz141OmNaadycMVXehxzKpcpCQksFSVAkGJXzgs0t9QoihAG2+/7DwKjsIT CZFE7br9/5ZkdRLWEpFhZ5oQeZC1wmIWLtbuwIb5n8PrzBIxYNqHzXVVS1ZAd6xwC/U/noEdvwQVm 7a7xgHyjwsEL7pYbK1AQ==; 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 1gk4xz-0000YM-A7; Thu, 17 Jan 2019 10:32:07 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gk4xu-0000UV-KH for linux-amlogic@lists.infradead.org; Thu, 17 Jan 2019 10:32:04 +0000 Received: by mail-wr1-x441.google.com with SMTP id z5so10342566wrt.11 for ; Thu, 17 Jan 2019 02:32:02 -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=M+aR/gi/5Y1MXmA3l33o5cCv3DhvJKA6RGHAmdL+89w=; b=SY8UCb2S0aaTYBSBMrVuMWUti2aRFjdJweUYsAczAg3S2YJp00MXuhAArZwOAZjBxd qft3/c49Rg2REcF/2R9S/TjNJTA5IfGfZqfB1ES3VWlREWlmgk0/7qtLrsNsTnKdnmJY g0+lczJRdclQGr6CJRcLx2lH6xIOyuHTsR4d8sn8QvZlBv1+mX+zRuXL3agPBvX1SuKR ZKZfKaHa5XDLr9/KqSoEN+PePn894BZV6z5cBBgc4PJPI3dXZ/vrrOqaTka+yjTBJzeT UgWpUG4NSqmMuyXMvNho7IXujzPlw6o+ACnBj3DAcb/9dkN7pxr5SdEOvby5qv+Tzyvr d2yw== 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=M+aR/gi/5Y1MXmA3l33o5cCv3DhvJKA6RGHAmdL+89w=; b=WjHWnB6k+XNksL/FCipo+ofc8GRO523MkBIoHQUfFIMlYTLITK70g6U/Hz4peHg8Mr A25Iz+LrKdM2NlvYsSi9BX54pVmfvoPmcIrA5iNo5yEMyrUWkBzGEUD+Z7VnwdqKqK8v fkRspt3oSBMQ4usHAuGocCLMyEvdBMsrQFrV1ZHRFTtPc0fo7vvuw7ZBrd+VgQj4Rzod bgjha/d8N75sNjIP03jmJBWb8jDIHuWbzq2gh8Bfpit6pD/JsoitZNLGpJvjmses4FYc zH/5TDXqY/UQSn0/KGXB6KG/pJFdp+ZkAK+L8su7mtkswMkV5qn/fHzr10MAnedqJxMG xNMg== X-Gm-Message-State: AJcUukeGUh+oQMBI29XmeUN2LSuECZvIhwrCUuPzGqxjNdfdXegXzR2N vbxchrQTnu+KmCuCO7BRyNKsmQ== X-Google-Smtp-Source: ALg8bN4YkpBB3huWK8lh1EuyQGOrr2d5EI1/BmoKj3CHaog7uoztiS6ucApg5SKmsOqikCI0cSvs+A== X-Received: by 2002:adf:e3d0:: with SMTP id k16mr11891258wrm.223.1547721120855; Thu, 17 Jan 2019 02:32:00 -0800 (PST) Received: from boomer.local ([2a01:e34:eeb6:4690:106b:bae3:31ed:7561]) by smtp.googlemail.com with ESMTPSA id 143sm77658107wml.14.2019.01.17.02.31.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Jan 2019 02:32:00 -0800 (PST) From: Jerome Brunet To: Kevin Hilman Subject: [PATCH 2/2] arm64: dts: meson: g12a: add uart_ao_a pinctrl Date: Thu, 17 Jan 2019 11:31:51 +0100 Message-Id: <20190117103151.3349-3-jbrunet@baylibre.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190117103151.3349-1-jbrunet@baylibre.com> References: <20190117103151.3349-1-jbrunet@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190117_023202_880599_AF124C74 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: linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, patchwork-bot+notify@kernel.org, linux-kernel@vger.kernel.org, Jerome Brunet Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- .../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 39ad2bbaa162..bd24de947a5b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -140,6 +140,24 @@ gpio-controller; #gpio-cells = <2>; }; + + 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; + }; + }; }; };