From patchwork Wed Jul 15 11:54:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lee X-Patchwork-Id: 11665195 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9183213B1 for ; Wed, 15 Jul 2020 11:56:03 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6AFDB20658 for ; Wed, 15 Jul 2020 11:56:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="1DS+KFTd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6AFDB20658 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=allwinnertech.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=CqTcWqp+unZwkjuKgbEE+QQwWro3j1UqkJpV6VV6Dts=; b=1DS+KFTdecC9vayBDh1ffmQROZ /a0qPnmLejoLSyhnQUBl89mW2wH9NQkiiU6eux3G7QkYGs1FYB+EJfsuEKsU2u+TsIt5ZGFIby9NQ Y+kQm4bx3/KxtLrJFJKD52iUANQLWpin/MImAUCcx79DFuDcrqzJcVqZ1ZEmLzUtxTAj+AtKf6ahA aldzxLW8qom1EMWuOAQgnkmHo67kNFqDDTA5hp3RSjjzoBU4NH0NMxWJJ3w9ZCOUSjOhY/lgxvWU7 eejz0zFXRP4BCbCGuw0aHxgnxro/s0W+iUV/ToVwsoIA4+WoRMjg4WxCTBwG3E7SizRabjYcC537O tJCt5ZNA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvfzn-0003qG-6t; Wed, 15 Jul 2020 11:54:43 +0000 Received: from smtp2207-205.mail.aliyun.com ([121.197.207.205]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvfzh-0003nr-1z for linux-arm-kernel@lists.infradead.org; Wed, 15 Jul 2020 11:54:40 +0000 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.1324965|-1; CH=green; DM=|CONTINUE|false|; DS=CONTINUE|ham_system_inform|0.0117998-0.000741579-0.987459; FP=0|0|0|0|0|-1|-1|-1; HT=e01l10422; MF=frank@allwinnertech.com; NM=1; PH=DS; RN=8; RT=8; SR=0; TI=SMTPD_---.I27xjjM_1594814062; Received: from allwinnertech.com(mailfrom:frank@allwinnertech.com fp:SMTPD_---.I27xjjM_1594814062) by smtp.aliyun-inc.com(10.147.41.121); Wed, 15 Jul 2020 19:54:27 +0800 From: Frank Lee To: robh+dt@kernel.org, mripard@kernel.org, wens@csie.org, tiny.windzz@gmail.com Subject: [PATCH 1/3] =?utf-8?q?dt-bindings=3A_gpio=3A_sunxi=EF=BC=9Acreate_a?= =?utf-8?q?_DT_header_for_Allwinner_pin_controller?= Date: Wed, 15 Jul 2020 19:54:12 +0800 Message-Id: <20200715115412.2544-1-frank@allwinnertech.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200715_075437_399551_8DCBA678 X-CRM114-Status: UNSURE ( 8.33 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [121.197.207.205 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Yangtao Li , linux-kernel@vger.kernel.org, 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 From: Yangtao Li The sunxi gpio binding defines a few custom cells for its gpio specifier. Provide bank name for those. Signed-off-by: Yangtao Li --- include/dt-bindings/gpio/sunxi-gpio.h | 29 +++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 include/dt-bindings/gpio/sunxi-gpio.h diff --git a/include/dt-bindings/gpio/sunxi-gpio.h b/include/dt-bindings/gpio/sunxi-gpio.h new file mode 100644 index 000000000000..c692b4360da6 --- /dev/null +++ b/include/dt-bindings/gpio/sunxi-gpio.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * GPIO definitions for Allwinner SoCs + * + * Copyright (C) 2020 Yangtao Li + */ + +#ifndef _DT_BINDINGS_SUNXI_GPIO_H +#define _DT_BINDINGS_SUNXI_GPIO_H + +#include + +/* pio */ +#define PA 0 +#define PB 1 +#define PC 2 +#define PD 3 +#define PE 4 +#define PF 5 +#define PG 6 +#define PH 7 +#define PI 8 + +/* r-pio */ +#define PL 0 +#define PM 1 +#define PN 2 + +#endif /* _DT_BINDINGS_SUNXI_GPIO_H */ From patchwork Wed Jul 15 11:55:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lee X-Patchwork-Id: 11665197 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E2C99722 for ; Wed, 15 Jul 2020 11:56:50 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BBB2020658 for ; Wed, 15 Jul 2020 11:56:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="zcxWe2F/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BBB2020658 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=allwinnertech.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=LKZMksGM372f1hqEUsbr6Xg1K1yms1tfipiSp5YPvu0=; b=zcxWe2F/kpVCyYDwCIzgn/UxGn oEkmbE9ENBOT/UyAe+o7o/ciEQrQ2nZS5kgm8gR44jXJ98JbqbAPF3F4wCVo1wTKfArfs1CTDBt9G AjAqFARX9QY+b+9X9vx/eIbziMu+ie8SybjjrS9p6RV2oQD3Ay7aDsf5K8FEE2W59mk0PeBkrfABu FEcSXTvNhpiuQSy/OfYI2x0tAivDJFEm4OdQUVMUPeNlC+FGZgoLRoWGg22kfl06Dpxzh7q3NmcSS OrvDIB5Pmlvw1u6XafqDoOGXclk8TOyubfCy7Fl4ZSfQeL2Bi5ipnmpq84yJV1w2px6URLEAgEpW2 WtJld78w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvg0Y-0003z0-KF; Wed, 15 Jul 2020 11:55:30 +0000 Received: from smtp2207-205.mail.aliyun.com ([121.197.207.205]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvg0W-0003xj-LW for linux-arm-kernel@lists.infradead.org; Wed, 15 Jul 2020 11:55:29 +0000 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.1505735|-1; CH=green; DM=|CONTINUE|false|; DS=CONTINUE|ham_system_inform|0.0298392-0.00123236-0.968928; FP=0|0|0|0|0|-1|-1|-1; HT=e02c03279; MF=frank@allwinnertech.com; NM=1; PH=DS; RN=8; RT=8; SR=0; TI=SMTPD_---.I264RN7_1594814118; Received: from allwinnertech.com(mailfrom:frank@allwinnertech.com fp:SMTPD_---.I264RN7_1594814118) by smtp.aliyun-inc.com(10.147.41.199); Wed, 15 Jul 2020 19:55:23 +0800 From: Frank Lee To: robh+dt@kernel.org, mripard@kernel.org, wens@csie.org, tiny.windzz@gmail.com Subject: [PATCH 2/3] ARM: dts: allwinner: convert gpio.h to sunxi-gpio.h Date: Wed, 15 Jul 2020 19:55:07 +0800 Message-Id: <20200715115507.2690-1-frank@allwinnertech.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200715_075528_951159_8A15FABF X-CRM114-Status: UNSURE ( 9.07 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [121.197.207.205 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Yangtao Li , linux-kernel@vger.kernel.org, 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 From: Yangtao Li Use names instead of numbers to describe GPIO. We clean arm64 first. Since H5 uses the DTS file in arm directory, we need to modify the header file in advance. Signed-off-by: Yangtao Li --- arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi | 2 +- arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi b/arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi index fc67e30fe212..93f9653b43f4 100644 --- a/arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi +++ b/arch/arm/boot/dts/sunxi-h3-h5-emlid-neutis.dtsi @@ -7,7 +7,7 @@ #include "sunxi-common-regulators.dtsi" -#include +#include / { aliases { diff --git a/arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi b/arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi index 19b3b23cfaa8..f6f14b5175e3 100644 --- a/arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi +++ b/arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi @@ -3,7 +3,7 @@ * Copyright (C) 2017 Chen-Yu Tsai */ -#include +#include #include / { From patchwork Wed Jul 15 11:55:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lee X-Patchwork-Id: 11665199 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 00327722 for ; Wed, 15 Jul 2020 11:57:32 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B31AA20658 for ; Wed, 15 Jul 2020 11:57:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="K9C7IkDf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B31AA20658 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=allwinnertech.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=0prvHflp33fiS5AtMfiEJDsHI/3iuq2bqLTSGAb0XKs=; b=K9C7IkDf6M9TsV0wCPk+5Rn6x+ Q0r9n0PSqHIuoZcjiXRH+Yaj5EY11sYGsbgMVMzqfJjuHTuhLyfbni/ErsWOVs7YKcRTLnCJJ5M4P 6w7wqw49muuv62ZoCyqJdGVRrxAb+FbINpTT5ZzGXgWStWzObo7JV8KfXLSzCYLJvl21hlhmIBR7Z Rdnx59nYSgFsCZYeCypueVZkULQk97P0k6l+D9fxdg3QrPZwKDTrg4qxs5uwutWiwbFCNo04svE3N gViT8lHMgRpc/nllJGUWxxqOIxCwNiiyJh3GLIdznrM/cqDE1JPsjZr7G5j+F27rxW/9uAPUsAWEA IOZmMvEw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvg0v-00045y-QY; Wed, 15 Jul 2020 11:55:53 +0000 Received: from smtp2207-205.mail.aliyun.com ([121.197.207.205]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvg0q-00043G-30 for linux-arm-kernel@lists.infradead.org; Wed, 15 Jul 2020 11:55:51 +0000 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.07436282|-1; CH=green; DM=|CONTINUE|false|; DS=CONTINUE|ham_system_inform|0.40782-0.00738642-0.584793; FP=0|0|0|0|0|-1|-1|-1; HT=e02c03267; MF=frank@allwinnertech.com; NM=1; PH=DS; RN=8; RT=8; SR=0; TI=SMTPD_---.I294862_1594814139; Received: from allwinnertech.com(mailfrom:frank@allwinnertech.com fp:SMTPD_---.I294862_1594814139) by smtp.aliyun-inc.com(10.147.41.187); Wed, 15 Jul 2020 19:55:43 +0800 From: Frank Lee To: robh+dt@kernel.org, mripard@kernel.org, wens@csie.org, tiny.windzz@gmail.com Subject: [PATCH 3/3] arm64: dts: allwinner: Use GPIO bank name macro to describe GPIO Date: Wed, 15 Jul 2020 19:55:29 +0800 Message-Id: <20200715115529.2769-1-frank@allwinnertech.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200715_075548_830851_23BBC664 X-CRM114-Status: GOOD ( 10.03 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [121.197.207.205 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Yangtao Li , linux-kernel@vger.kernel.org, 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 From: Yangtao Li Convert gpio.h to sunxi-gpio.h, and convert to use gpio bank name macro. This is done using the following command. sed -i 's/r_pio 0/r_pio PL/g' arch/arm64/boot/dts/allwinner/* sed -i 's/r_pio 1/r_pio PM/g' arch/arm64/boot/dts/allwinner/* sed -i 's/\&pio 0/\&pio PA/g' arch/arm64/boot/dts/allwinner/* sed -i 's/\&pio 2/\&pio PC/g' arch/arm64/boot/dts/allwinner/* sed -i 's/\&pio 3/\&pio PD/g' arch/arm64/boot/dts/allwinner/* sed -i 's/\&pio 4/\&pio PE/g' arch/arm64/boot/dts/allwinner/* sed -i 's/\&pio 5/\&pio PF/g' arch/arm64/boot/dts/allwinner/* sed -i 's/\&pio 6/\&pio PG/g' arch/arm64/boot/dts/allwinner/* sed -i 's/\&pio 7/\&pio PH/g' arch/arm64/boot/dts/allwinner/* sed -i 's/dt-bindings\/gpio\/gpio.h/dt-bindings\/gpio\/sunxi-gpio.h/g' \ arch/arm64/boot/dts/allwinner/* Signed-off-by: Yangtao Li --- .../allwinner/sun50i-a64-amarula-relic.dts | 18 ++++++------ .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 20 ++++++------- .../dts/allwinner/sun50i-a64-nanopi-a64.dts | 8 +++--- .../sun50i-a64-oceanic-5205-5inmfd.dts | 4 +-- .../dts/allwinner/sun50i-a64-olinuxino.dts | 12 ++++---- .../dts/allwinner/sun50i-a64-orangepi-win.dts | 20 ++++++------- .../boot/dts/allwinner/sun50i-a64-pine64.dts | 4 +-- .../dts/allwinner/sun50i-a64-pinebook.dts | 16 +++++------ .../dts/allwinner/sun50i-a64-pinephone.dtsi | 14 +++++----- .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 28 +++++++++---------- .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 4 +-- .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 20 ++++++------- .../sun50i-h5-emlid-neutis-n5-devboard.dts | 2 +- .../sun50i-h5-libretech-all-h5-cc.dts | 2 +- .../allwinner/sun50i-h5-nanopi-neo-plus2.dts | 14 +++++----- .../dts/allwinner/sun50i-h5-nanopi-neo2.dts | 14 +++++----- .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 16 +++++------ .../allwinner/sun50i-h5-orangepi-prime.dts | 18 ++++++------ .../sun50i-h5-orangepi-zero-plus.dts | 13 +++++---- .../sun50i-h5-orangepi-zero-plus2.dts | 6 ++-- .../dts/allwinner/sun50i-h6-beelink-gs1.dts | 8 +++--- .../dts/allwinner/sun50i-h6-orangepi-3.dts | 20 ++++++------- .../allwinner/sun50i-h6-orangepi-lite2.dts | 8 +++--- .../allwinner/sun50i-h6-orangepi-one-plus.dts | 2 +- .../dts/allwinner/sun50i-h6-orangepi.dtsi | 12 ++++---- .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 16 +++++------ .../dts/allwinner/sun50i-h6-tanix-tx6.dts | 6 ++-- 27 files changed, 163 insertions(+), 162 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts index c7bd73f35ed8..92f8caecf939 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts @@ -7,7 +7,7 @@ #include "sun50i-a64.dtsi" #include "sun50i-a64-cpu-opp.dtsi" -#include +#include / { model = "Amarula A64-Relic"; @@ -23,8 +23,8 @@ chosen { i2c { compatible = "i2c-gpio"; - sda-gpios = <&pio 4 13 GPIO_ACTIVE_HIGH>; - scl-gpios = <&pio 4 12 GPIO_ACTIVE_HIGH>; + sda-gpios = <&pio PE 13 GPIO_ACTIVE_HIGH>; + scl-gpios = <&pio PE 12 GPIO_ACTIVE_HIGH>; i2c-gpio,delay-us = <5>; #address-cells = <1>; #size-cells = <0>; @@ -40,8 +40,8 @@ ov5640: camera@3c { AVDD-supply = <®_aldo1>; DOVDD-supply = <®_dldo3>; DVDD-supply = <®_eldo3>; - reset-gpios = <&pio 4 14 GPIO_ACTIVE_LOW>; /* CSI-RST-R: PE14 */ - powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; /* CSI-STBY-R: PE15 */ + reset-gpios = <&pio PE 14 GPIO_ACTIVE_LOW>; /* CSI-RST-R: PE14 */ + powerdown-gpios = <&pio PE 15 GPIO_ACTIVE_HIGH>; /* CSI-STBY-R: PE15 */ port { ov5640_ep: endpoint { @@ -60,7 +60,7 @@ wifi_pwrseq: wifi-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rtc 1>; clock-names = "ext_clock"; - reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* WL-PMU-EN: PL2 */ + reset-gpios = <&r_pio PL 2 GPIO_ACTIVE_LOW>; /* WL-PMU-EN: PL2 */ }; }; @@ -121,8 +121,8 @@ touchscreen@5d { AVDD28-supply = <®_ldo_io0>; /* VCC-CTP: GPIO0-LDO */ interrupt-parent = <&pio>; interrupts = <7 4 IRQ_TYPE_EDGE_FALLING>; - irq-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* CTP-INT: PH4 */ - reset-gpios = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* CTP-RST: PH8 */ + irq-gpios = <&pio PH 4 GPIO_ACTIVE_HIGH>; /* CTP-INT: PH4 */ + reset-gpios = <&pio PH 8 GPIO_ACTIVE_HIGH>; /* CTP-RST: PH8 */ touchscreen-inverted-x; touchscreen-inverted-y; }; @@ -314,7 +314,7 @@ &usb_otg { }; &usbphy { - usb0_id_det-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ + usb0_id_det-gpios = <&pio PH 9 GPIO_ACTIVE_HIGH>; /* PH9 */ usb0_vbus-supply = <®_drivevbus>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts index 883f217efb81..0c5a3b044535 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts @@ -6,7 +6,7 @@ #include "sun50i-a64.dtsi" #include "sun50i-a64-cpu-opp.dtsi" -#include +#include / { model = "BananaPi-M64"; @@ -38,24 +38,24 @@ leds { pwr-led { label = "bananapi-m64:red:pwr"; - gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */ + gpios = <&pio PD 24 GPIO_ACTIVE_HIGH>; /* PD24 */ default-state = "on"; }; green { label = "bananapi-m64:green:user"; - gpios = <&pio 4 14 GPIO_ACTIVE_HIGH>; /* PE14 */ + gpios = <&pio PE 14 GPIO_ACTIVE_HIGH>; /* PE14 */ }; blue { label = "bananapi-m64:blue:user"; - gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; /* PE15 */ + gpios = <&pio PE 15 GPIO_ACTIVE_HIGH>; /* PE15 */ }; }; wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ + reset-gpios = <&r_pio PL 2 GPIO_ACTIVE_LOW>; /* PL2 */ clocks = <&rtc 1>; clock-names = "ext_clock"; }; @@ -141,7 +141,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; disable-wp; bus-width = <4>; status = "okay"; @@ -359,9 +359,9 @@ bluetooth { clock-names = "lpo"; vbat-supply = <®_dldo2>; vddio-supply = <®_dldo4>; - device-wakeup-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */ - host-wakeup-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */ - shutdown-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */ + device-wakeup-gpios = <&r_pio PL 6 GPIO_ACTIVE_HIGH>; /* PL6 */ + host-wakeup-gpios = <&r_pio PL 5 GPIO_ACTIVE_HIGH>; /* PL5 */ + shutdown-gpios = <&r_pio PL 4 GPIO_ACTIVE_HIGH>; /* PL4 */ }; }; @@ -375,7 +375,7 @@ &usb_power_supply { }; &usbphy { - usb0_id_det-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ + usb0_id_det-gpios = <&pio PH 9 GPIO_ACTIVE_HIGH>; /* PH9 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_drivevbus>; status = "okay"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts index e58db8a6cab6..1cdf6baa86bc 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts @@ -6,7 +6,7 @@ #include "sun50i-a64.dtsi" #include "sun50i-a64-cpu-opp.dtsi" -#include +#include / { model = "FriendlyARM NanoPi A64"; @@ -37,7 +37,7 @@ leds { blue { label = "nanopi-a64:blue:status"; - gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */ + gpios = <&pio PD 24 GPIO_ACTIVE_LOW>; /* PD24 */ }; }; @@ -45,7 +45,7 @@ wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rtc 1>; clock-names = "ext_clock"; - reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ + reset-gpios = <&r_pio PL 2 GPIO_ACTIVE_LOW>; /* PL2 */ }; }; @@ -113,7 +113,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; disable-wp; bus-width = <4>; status = "okay"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts index 577f9e1d08a1..8692e885ca7f 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts @@ -44,8 +44,8 @@ touchscreen@5d { AVDD28-supply = <®_ldo_io0>; /* VDD_CTP: GPIO0-LDO */ interrupt-parent = <&pio>; interrupts = <7 4 IRQ_TYPE_EDGE_FALLING>; - irq-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* CTP-INT: PH4 */ - reset-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* CTP-RST: PH11 */ + irq-gpios = <&pio PH 4 GPIO_ACTIVE_HIGH>; /* CTP-INT: PH4 */ + reset-gpios = <&pio PH 11 GPIO_ACTIVE_HIGH>; /* CTP-RST: PH11 */ touchscreen-inverted-x; touchscreen-inverted-y; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts index f3f8e177ab61..41e7870ea5e4 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts @@ -6,7 +6,7 @@ #include "sun50i-a64.dtsi" #include "sun50i-a64-cpu-opp.dtsi" -#include +#include / { model = "Olimex A64-Olinuxino"; @@ -37,7 +37,7 @@ leds { led-0 { label = "a64-olinuxino:red:user"; - gpios = <&pio 4 17 GPIO_ACTIVE_HIGH>; /* PE17 */ + gpios = <&pio PE 17 GPIO_ACTIVE_HIGH>; /* PE17 */ }; }; @@ -48,13 +48,13 @@ reg_usb1_vbus: usb1-vbus { regulator-max-microvolt = <5000000>; regulator-boot-on; enable-active-high; - gpio = <&pio 6 9 GPIO_ACTIVE_HIGH>; /* PG9 */ + gpio = <&pio PG 9 GPIO_ACTIVE_HIGH>; /* PG9 */ status = "okay"; }; wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ + reset-gpios = <&r_pio PL 2 GPIO_ACTIVE_LOW>; /* PL2 */ }; }; @@ -118,7 +118,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; disable-wp; bus-width = <4>; status = "okay"; @@ -341,7 +341,7 @@ &usb_otg { &usbphy { status = "okay"; - usb0_id_det-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ + usb0_id_det-gpios = <&pio PH 9 GPIO_ACTIVE_HIGH>; /* PH9 */ usb0_vbus-supply = <®_drivevbus>; usb1_vbus-supply = <®_usb1_vbus>; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts index fde9c7a99b17..fed087227c02 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts @@ -7,7 +7,7 @@ #include "sun50i-a64.dtsi" #include "sun50i-a64-cpu-opp.dtsi" -#include +#include / { model = "OrangePi Win/Win Plus"; @@ -42,7 +42,7 @@ leds { status { label = "orangepi:green:status"; - gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */ + gpios = <&pio PH 11 GPIO_ACTIVE_HIGH>; /* PH11 */ }; }; @@ -53,7 +53,7 @@ reg_gmac_3v3: gmac-3v3 { regulator-max-microvolt = <3300000>; regulator-boot-on; enable-active-high; - gpio = <&pio 3 14 GPIO_ACTIVE_HIGH>; /* PD14 */ + gpio = <&pio PD 14 GPIO_ACTIVE_HIGH>; /* PD14 */ status = "okay"; }; @@ -64,13 +64,13 @@ reg_usb1_vbus: usb1-vbus { regulator-max-microvolt = <5000000>; regulator-boot-on; enable-active-high; - gpio = <&pio 3 7 GPIO_ACTIVE_HIGH>; /* PD7 */ + gpio = <&pio PD 7 GPIO_ACTIVE_HIGH>; /* PD7 */ status = "okay"; }; wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 */ + reset-gpios = <&r_pio PL 8 GPIO_ACTIVE_LOW>; /* PL8 */ clocks = <&rtc 1>; clock-names = "ext_clock"; }; @@ -148,7 +148,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; /* PF6 */ disable-wp; bus-width = <4>; status = "okay"; @@ -373,9 +373,9 @@ bluetooth { clock-names = "lpo"; vbat-supply = <®_dldo2>; vddio-supply = <®_dldo4>; - device-wakeup-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */ - host-wakeup-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */ - shutdown-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */ + device-wakeup-gpios = <&r_pio PL 6 GPIO_ACTIVE_HIGH>; /* PL6 */ + host-wakeup-gpios = <&r_pio PL 5 GPIO_ACTIVE_HIGH>; /* PL5 */ + shutdown-gpios = <&r_pio PL 4 GPIO_ACTIVE_HIGH>; /* PL4 */ }; }; @@ -406,7 +406,7 @@ &usb_otg { }; &usbphy { - usb0_id_det-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ + usb0_id_det-gpios = <&pio PH 9 GPIO_ACTIVE_HIGH>; /* PH9 */ usb0_vbus-supply = <®_drivevbus>; usb1_vbus-supply = <®_usb1_vbus>; status = "okay"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index 2165f238af13..a48297098416 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -6,7 +6,7 @@ #include "sun50i-a64.dtsi" #include "sun50i-a64-cpu-opp.dtsi" -#include +#include / { model = "Pine64"; @@ -118,7 +118,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; disable-wp; bus-width = <4>; status = "okay"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts index 64b1c54f87c0..0a665813df6c 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts @@ -7,7 +7,7 @@ #include "sun50i-a64.dtsi" #include "sun50i-a64-cpu-opp.dtsi" -#include +#include #include #include #include @@ -26,7 +26,7 @@ backlight: backlight { pwms = <&pwm 0 50000 0>; brightness-levels = <0 5 10 15 20 30 40 55 70 85 100>; default-brightness-level = <2>; - enable-gpios = <&pio 3 23 GPIO_ACTIVE_HIGH>; /* PD23 */ + enable-gpios = <&pio PD 23 GPIO_ACTIVE_HIGH>; /* PD23 */ power-supply = <®_vbklt>; }; @@ -39,7 +39,7 @@ gpio_keys { lid_switch { label = "Lid Switch"; - gpios = <&r_pio 0 12 GPIO_ACTIVE_LOW>; /* PL12 */ + gpios = <&r_pio PL 12 GPIO_ACTIVE_LOW>; /* PL12 */ linux,input-type = ; linux,code = ; linux,can-disable; @@ -65,7 +65,7 @@ reg_vbklt: vbklt { regulator-name = "vbklt"; regulator-min-microvolt = <18000000>; regulator-max-microvolt = <18000000>; - gpio = <&pio 7 6 GPIO_ACTIVE_HIGH>; /* PH6 */ + gpio = <&pio PH 6 GPIO_ACTIVE_HIGH>; /* PH6 */ enable-active-high; }; @@ -80,13 +80,13 @@ reg_vcc5v0: vcc5v0 { wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ + reset-gpios = <&r_pio PL 2 GPIO_ACTIVE_LOW>; /* PL2 */ }; speaker_amp: audio-amplifier { compatible = "simple-audio-amplifier"; VCC-supply = <®_vcc5v0>; - enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */ + enable-gpios = <&pio PH 7 GPIO_ACTIVE_HIGH>; /* PH7 */ sound-name-prefix = "Speaker Amp"; }; @@ -143,7 +143,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; /* PF6 */ disable-wp; bus-width = <4>; status = "okay"; @@ -206,7 +206,7 @@ &r_i2c { anx6345: anx6345@38 { compatible = "analogix,anx6345"; reg = <0x38>; - reset-gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */ + reset-gpios = <&pio PD 24 GPIO_ACTIVE_LOW>; /* PD24 */ dvdd25-supply = <®_dldo2>; dvdd12-supply = <®_fldo1>; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi index cefda145c3c9..e2ebda1509b6 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi @@ -6,7 +6,7 @@ #include "sun50i-a64.dtsi" #include "sun50i-a64-cpu-opp.dtsi" -#include +#include #include #include #include @@ -26,31 +26,31 @@ leds { blue { function = LED_FUNCTION_INDICATOR; color = ; - gpios = <&pio 3 20 GPIO_ACTIVE_HIGH>; /* PD20 */ + gpios = <&pio PD 20 GPIO_ACTIVE_HIGH>; /* PD20 */ }; green { function = LED_FUNCTION_INDICATOR; color = ; - gpios = <&pio 3 18 GPIO_ACTIVE_HIGH>; /* PD18 */ + gpios = <&pio PD 18 GPIO_ACTIVE_HIGH>; /* PD18 */ }; red { function = LED_FUNCTION_INDICATOR; color = ; - gpios = <&pio 3 19 GPIO_ACTIVE_HIGH>; /* PD19 */ + gpios = <&pio PD 19 GPIO_ACTIVE_HIGH>; /* PD19 */ }; }; speaker_amp: audio-amplifier { compatible = "simple-audio-amplifier"; - enable-gpios = <&pio 2 7 GPIO_ACTIVE_HIGH>; /* PC7 */ + enable-gpios = <&pio PC 7 GPIO_ACTIVE_HIGH>; /* PC7 */ sound-name-prefix = "Speaker Amp"; }; vibrator { compatible = "gpio-vibrator"; - enable-gpios = <&pio 3 2 GPIO_ACTIVE_HIGH>; /* PD2 */ + enable-gpios = <&pio PD 2 GPIO_ACTIVE_HIGH>; /* PD2 */ vcc-supply = <®_dcdc1>; }; }; @@ -143,7 +143,7 @@ &mmc0 { pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; vqmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; /* PF6 */ disable-wp; bus-width = <4>; status = "okay"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts index dc4ab6b434f9..add0bac28e31 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts @@ -9,7 +9,7 @@ #include "sun50i-a64.dtsi" #include "sun50i-a64-cpu-opp.dtsi" -#include +#include #include #include @@ -27,7 +27,7 @@ backlight: backlight { pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; brightness-levels = <0 16 18 20 22 24 26 29 32 35 38 42 46 51 56 62 68 75 83 91 100>; default-brightness-level = <15>; - enable-gpios = <&pio 3 23 GPIO_ACTIVE_HIGH>; /* PD23 */ + enable-gpios = <&pio PD 23 GPIO_ACTIVE_HIGH>; /* PD23 */ power-supply = <&vdd_bl>; }; @@ -37,8 +37,8 @@ chosen { i2c-csi { compatible = "i2c-gpio"; - sda-gpios = <&pio 4 13 GPIO_ACTIVE_HIGH>; /* PE13 */ - scl-gpios = <&pio 4 12 GPIO_ACTIVE_HIGH>; /* PE12 */ + sda-gpios = <&pio PE 13 GPIO_ACTIVE_HIGH>; /* PE13 */ + scl-gpios = <&pio PE 12 GPIO_ACTIVE_HIGH>; /* PE12 */ i2c-gpio,delay-us = <5>; #address-cells = <1>; #size-cells = <0>; @@ -55,8 +55,8 @@ ov5640: camera@3c { AVDD-supply = <®_dldo3>; DOVDD-supply = <®_aldo1>; DVDD-supply = <®_eldo3>; - reset-gpios = <&pio 4 14 GPIO_ACTIVE_LOW>; /* PE14 */ - powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; /* PE15 */ + reset-gpios = <&pio PE 14 GPIO_ACTIVE_LOW>; /* PE14 */ + powerdown-gpios = <&pio PE 15 GPIO_ACTIVE_HIGH>; /* PE15 */ port { ov5640_ep: endpoint { @@ -73,7 +73,7 @@ ov5640_ep: endpoint { speaker_amp: audio-amplifier { compatible = "simple-audio-amplifier"; - enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */ + enable-gpios = <&pio PH 7 GPIO_ACTIVE_HIGH>; /* PH7 */ sound-name-prefix = "Speaker Amp"; }; @@ -82,13 +82,13 @@ vdd_bl: regulator@0 { regulator-name = "bl-3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&pio 7 6 GPIO_ACTIVE_HIGH>; /* PH6 */ + gpio = <&pio PH 6 GPIO_ACTIVE_HIGH>; /* PH6 */ enable-active-high; }; wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ + reset-gpios = <&r_pio PL 2 GPIO_ACTIVE_LOW>; /* PL2 */ post-power-on-delay-ms = <200>; }; }; @@ -158,7 +158,7 @@ panel@0 { avdd-supply = <®_dc1sw>; dvdd-supply = <®_dc1sw>; cvdd-supply = <®_ldo_io1>; - reset-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */ + reset-gpios = <&pio PD 24 GPIO_ACTIVE_HIGH>; /* PD24 */ backlight = <&backlight>; }; }; @@ -179,8 +179,8 @@ touchscreen@5d { reg = <0x5d>; interrupt-parent = <&pio>; interrupts = <7 4 IRQ_TYPE_LEVEL_HIGH>; /* PH4 */ - irq-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ - reset-gpios = <&pio 7 8 GPIO_ACTIVE_HIGH>; /* PH8 */ + irq-gpios = <&pio PH 4 GPIO_ACTIVE_HIGH>; /* PH4 */ + reset-gpios = <&pio PH 8 GPIO_ACTIVE_HIGH>; /* PH8 */ AVDD28-supply = <®_ldo_io1>; }; }; @@ -222,7 +222,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; disable-wp; bus-width = <4>; status = "okay"; @@ -452,7 +452,7 @@ &usb_power_supply { }; &usbphy { - usb0_id_det-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */ + usb0_id_det-gpios = <&pio PH 9 GPIO_ACTIVE_HIGH>; /* PH9 */ usb0_vbus_power-supply = <&usb_power_supply>; usb0_vbus-supply = <®_drivevbus>; usb1_vbus-supply = <®_ldo_io0>; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi index c48692b06e1f..14aef9acd2bf 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi @@ -6,7 +6,7 @@ #include "sun50i-a64.dtsi" #include "sun50i-a64-cpu-opp.dtsi" -#include +#include &codec_analog { cpvdd-supply = <®_eldo1>; @@ -35,7 +35,7 @@ &mmc0 { non-removable; disable-wp; bus-width = <4>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; /* PF6 */ status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts index f5df5f705b72..6c78bb02ad4f 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts @@ -7,7 +7,7 @@ #include "sun50i-a64.dtsi" #include "sun50i-a64-cpu-opp.dtsi" -#include +#include #include #include @@ -25,7 +25,7 @@ backlight: backlight { power-supply = <®_dcdc1>; brightness-levels = <0 5 7 10 14 20 28 40 56 80 112>; default-brightness-level = <5>; - enable-gpios = <&pio 3 23 GPIO_ACTIVE_HIGH>; /* PD23 */ + enable-gpios = <&pio PD 23 GPIO_ACTIVE_HIGH>; /* PD23 */ }; chosen { @@ -42,7 +42,7 @@ gpio-keys { lid-switch { label = "Lid Switch"; - gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 */ + gpios = <&r_pio PL 8 GPIO_ACTIVE_LOW>; /* PL8 */ linux,input-type = ; linux,code = ; wakeup-source; @@ -54,12 +54,12 @@ leds { capslock { label = "teres-i:green:capslock"; - gpios = <&pio 2 7 GPIO_ACTIVE_HIGH>; /* PC7 */ + gpios = <&pio PC 7 GPIO_ACTIVE_HIGH>; /* PC7 */ }; numlock { label = "teres-i:green:numlock"; - gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */ + gpios = <&pio PC 4 GPIO_ACTIVE_HIGH>; /* PC4 */ }; }; @@ -69,18 +69,18 @@ reg_usb1_vbus: usb1-vbus { regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; - gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */ + gpio = <&r_pio PL 7 GPIO_ACTIVE_HIGH>; /* PL7 */ status = "okay"; }; wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ + reset-gpios = <&r_pio PL 2 GPIO_ACTIVE_LOW>; /* PL2 */ }; speaker_amp: audio-amplifier { compatible = "simple-audio-amplifier"; - enable-gpios = <&r_pio 0 12 GPIO_ACTIVE_HIGH>; /* PL12 */ + enable-gpios = <&r_pio PL 12 GPIO_ACTIVE_HIGH>; /* PL12 */ sound-name-prefix = "Speaker Amp"; }; }; @@ -130,7 +130,7 @@ &i2c0 { anx6345: anx6345@38 { compatible = "analogix,anx6345"; reg = <0x38>; - reset-gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */ + reset-gpios = <&pio PD 24 GPIO_ACTIVE_LOW>; /* PD24 */ dvdd25-supply = <®_dldo2>; dvdd12-supply = <®_dldo3>; @@ -155,7 +155,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_dcdc1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; disable-wp; bus-width = <4>; status = "okay"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts index 076a0b983101..5d0746c59713 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts @@ -35,7 +35,7 @@ vdd_cpux: gpio-regulator { regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1300000>; regulator-ramp-delay = <50>; /* 4ms */ - gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */ + gpios = <&r_pio PL 6 GPIO_ACTIVE_HIGH>; /* PL6 */ gpios-states = <0x1>; states = <1100000 0>, <1300000 1>; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts index df1b9263ad0e..39f6e905e172 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts @@ -18,7 +18,7 @@ reg_gmac_3v3: gmac-3v3 { regulator-max-microvolt = <3300000>; startup-delay-us = <5000>; enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; + gpio = <&pio PD 6 GPIO_ACTIVE_HIGH>; vin-supply = <®_vcc5v0>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts index 4f9ba53ffaae..da6988c8db7d 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts @@ -5,7 +5,7 @@ /dts-v1/; #include "sun50i-h5.dtsi" -#include +#include #include #include @@ -27,13 +27,13 @@ leds { pwr { label = "nanopi:green:pwr"; - gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; + gpios = <&r_pio PL 10 GPIO_ACTIVE_HIGH>; default-state = "on"; }; status { label = "nanopi:red:status"; - gpios = <&pio 0 20 GPIO_ACTIVE_HIGH>; + gpios = <&pio PA 20 GPIO_ACTIVE_HIGH>; }; }; @@ -44,7 +44,7 @@ reg_gmac_3v3: gmac-3v3 { regulator-max-microvolt = <3300000>; startup-delay-us = <100000>; enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; + gpio = <&pio PD 6 GPIO_ACTIVE_HIGH>; }; reg_vcc3v3: vcc3v3 { @@ -63,14 +63,14 @@ vdd_cpux: gpio-regulator { regulator-min-microvolt = <1100000>; regulator-max-microvolt = <1300000>; regulator-ramp-delay = <50>; /* 4ms */ - gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; + gpios = <&r_pio PL 6 GPIO_ACTIVE_HIGH>; gpios-states = <0x1>; states = <1100000 0>, <1300000 1>; }; wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ + reset-gpios = <&r_pio PL 7 GPIO_ACTIVE_LOW>; /* PL7 */ post-power-on-delay-ms = <200>; }; }; @@ -110,7 +110,7 @@ ext_rgmii_phy: ethernet-phy@7 { &mmc0 { vmmc-supply = <®_vcc3v3>; bus-width = <4>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; /* PF6 */ status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts index b059e20813bd..3e8ec5632c3f 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts @@ -4,7 +4,7 @@ /dts-v1/; #include "sun50i-h5.dtsi" -#include +#include / { model = "FriendlyARM NanoPi NEO 2"; @@ -24,13 +24,13 @@ leds { pwr { label = "nanopi:green:pwr"; - gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; + gpios = <&r_pio PL 10 GPIO_ACTIVE_HIGH>; default-state = "on"; }; status { label = "nanopi:blue:status"; - gpios = <&pio 0 10 GPIO_ACTIVE_HIGH>; + gpios = <&pio PA 10 GPIO_ACTIVE_HIGH>; }; }; @@ -41,7 +41,7 @@ reg_gmac_3v3: gmac-3v3 { regulator-max-microvolt = <3300000>; startup-delay-us = <100000>; enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; + gpio = <&pio PD 6 GPIO_ACTIVE_HIGH>; }; reg_vcc3v3: vcc3v3 { @@ -57,7 +57,7 @@ reg_usb0_vbus: usb0-vbus { regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; - gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */ + gpio = <&r_pio PL 2 GPIO_ACTIVE_HIGH>; /* PL2 */ status = "okay"; }; }; @@ -89,7 +89,7 @@ ext_rgmii_phy: ethernet-phy@7 { &mmc0 { vmmc-supply = <®_vcc3v3>; bus-width = <4>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; /* PF6 */ status = "okay"; }; @@ -114,7 +114,7 @@ &usb_otg { &usbphy { /* USB Type-A port's VBUS is always on */ - usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ + usb0_id_det-gpios = <&pio PG 12 GPIO_ACTIVE_HIGH>; /* PG12 */ usb0_vbus-supply = <®_usb0_vbus>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts index 7d7aad18f078..f5e53bace07b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts @@ -4,7 +4,7 @@ /dts-v1/; #include "sun50i-h5.dtsi" -#include +#include #include #include @@ -44,13 +44,13 @@ leds { pwr { label = "orangepi:green:pwr"; - gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; + gpios = <&r_pio PL 10 GPIO_ACTIVE_HIGH>; default-state = "on"; }; status { label = "orangepi:red:status"; - gpios = <&pio 0 20 GPIO_ACTIVE_HIGH>; + gpios = <&pio PA 20 GPIO_ACTIVE_HIGH>; }; }; @@ -60,7 +60,7 @@ r-gpio-keys { sw4 { label = "sw4"; linux,code = ; - gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; + gpios = <&r_pio PL 3 GPIO_ACTIVE_LOW>; wakeup-source; }; }; @@ -72,7 +72,7 @@ reg_gmac_3v3: gmac-3v3 { regulator-max-microvolt = <3300000>; startup-delay-us = <100000>; enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; + gpio = <&pio PD 6 GPIO_ACTIVE_HIGH>; }; reg_usb0_vbus: usb0-vbus { @@ -81,7 +81,7 @@ reg_usb0_vbus: usb0-vbus { regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; - gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */ + gpio = <&r_pio PL 2 GPIO_ACTIVE_HIGH>; /* PL2 */ status = "okay"; }; }; @@ -153,7 +153,7 @@ &ir { &mmc0 { vmmc-supply = <®_vcc3v3>; bus-width = <4>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; /* PF6 */ status = "okay"; }; @@ -226,7 +226,7 @@ &usb_otg { &usbphy { /* USB Type-A ports' VBUS is always on */ - usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ + usb0_id_det-gpios = <&pio PG 12 GPIO_ACTIVE_HIGH>; /* PG12 */ usb0_vbus-supply = <®_usb0_vbus>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts index cb44bfa5981f..33419f18c657 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts @@ -6,7 +6,7 @@ /dts-v1/; #include "sun50i-h5.dtsi" -#include +#include #include / { @@ -38,13 +38,13 @@ leds { pwr { label = "orangepi:green:pwr"; - gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; + gpios = <&r_pio PL 10 GPIO_ACTIVE_HIGH>; default-state = "on"; }; status { label = "orangepi:red:status"; - gpios = <&pio 0 20 GPIO_ACTIVE_HIGH>; + gpios = <&pio PA 20 GPIO_ACTIVE_HIGH>; }; }; @@ -54,7 +54,7 @@ r-gpio-keys { sw4 { label = "sw4"; linux,code = ; - gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; + gpios = <&r_pio PL 3 GPIO_ACTIVE_LOW>; }; }; @@ -65,7 +65,7 @@ reg_gmac_3v3: gmac-3v3 { regulator-max-microvolt = <3300000>; startup-delay-us = <100000>; enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; + gpio = <&pio PD 6 GPIO_ACTIVE_HIGH>; }; reg_vcc3v3: vcc3v3 { @@ -81,13 +81,13 @@ reg_usb0_vbus: usb0-vbus { regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; enable-active-high; - gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */ + gpio = <&r_pio PL 2 GPIO_ACTIVE_HIGH>; /* PL2 */ status = "okay"; }; wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - reset-gpios = <&pio 2 14 GPIO_ACTIVE_LOW>; /* PC14 */ + reset-gpios = <&pio PC 14 GPIO_ACTIVE_LOW>; /* PC14 */ }; }; @@ -154,7 +154,7 @@ &ir { &mmc0 { vmmc-supply = <®_vcc3v3>; bus-width = <4>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; /* PF6 */ status = "okay"; }; @@ -207,7 +207,7 @@ &usb_otg { &usbphy { /* USB Type-A ports' VBUS is always on */ - usb0_id_det-gpios = <&pio 0 21 GPIO_ACTIVE_HIGH>; /* PA21 */ + usb0_id_det-gpios = <&pio PA 21 GPIO_ACTIVE_HIGH>; /* PA21 */ usb0_vbus-supply = <®_usb0_vbus>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts index ef5ca6444220..9c9c80180673 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts @@ -5,7 +5,7 @@ /dts-v1/; #include "sun50i-h5.dtsi" -#include +#include #include #include @@ -35,13 +35,14 @@ leds { pwr { label = "orangepi:green:pwr"; - gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PA10 */ + /* FIXME: PA10 or PL10 ? */ + gpios = <&r_pio PL 10 GPIO_ACTIVE_HIGH>; default-state = "on"; }; status { label = "orangepi:red:status"; - gpios = <&pio 0 17 GPIO_ACTIVE_HIGH>; /* PA17 */ + gpios = <&pio PA 17 GPIO_ACTIVE_HIGH>; /* PA17 */ }; }; @@ -52,7 +53,7 @@ reg_gmac_3v3: gmac-3v3 { regulator-max-microvolt = <3300000>; startup-delay-us = <100000>; enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */ + gpio = <&pio PD 6 GPIO_ACTIVE_HIGH>; /* PD6 */ }; }; @@ -83,7 +84,7 @@ ext_rgmii_phy: ethernet-phy@1 { &mmc0 { vmmc-supply = <®_vcc3v3>; bus-width = <4>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; /* PF6 */ status = "okay"; }; @@ -135,6 +136,6 @@ &usb_otg { &usbphy { /* USB Type-A ports' VBUS is always on */ - usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ + usb0_id_det-gpios = <&pio PG 12 GPIO_ACTIVE_HIGH>; /* PG12 */ status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts index c95a68541309..aea3f00aaec2 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts @@ -5,7 +5,7 @@ #include "sun50i-h5.dtsi" -#include +#include / { model = "OrangePi Zero Plus2"; @@ -39,7 +39,7 @@ reg_vcc3v3: vcc3v3 { wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; - reset-gpios = <&pio 0 9 GPIO_ACTIVE_LOW>; /* PA9 */ + reset-gpios = <&pio PA 9 GPIO_ACTIVE_LOW>; /* PA9 */ post-power-on-delay-ms = <200>; }; }; @@ -61,7 +61,7 @@ hdmi_out_con: endpoint { &mmc0 { vmmc-supply = <®_vcc3v3>; bus-width = <4>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts index 3f7ceeb1a767..a763e4d1bdad 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts @@ -6,7 +6,7 @@ #include "sun50i-h6.dtsi" #include "sun50i-h6-cpu-opp.dtsi" -#include +#include / { model = "Beelink GS1"; @@ -24,7 +24,7 @@ chosen { connector { compatible = "hdmi-connector"; type = "a"; - ddc-en-gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */ + ddc-en-gpios = <&pio PH 2 GPIO_ACTIVE_HIGH>; /* PH2 */ port { hdmi_con_in: endpoint { @@ -45,7 +45,7 @@ leds { power { label = "beelink:white:power"; - gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */ + gpios = <&r_pio PL 4 GPIO_ACTIVE_HIGH>; /* PL4 */ default-state = "on"; }; }; @@ -127,7 +127,7 @@ ext_rgmii_phy: ethernet-phy@1 { &mmc0 { vmmc-supply = <®_cldo1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; bus-width = <4>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts index 15c9dd8c4479..2ceae2c0025f 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts @@ -6,7 +6,7 @@ #include "sun50i-h6.dtsi" #include "sun50i-h6-cpu-opp.dtsi" -#include +#include / { model = "OrangePi 3"; @@ -23,7 +23,7 @@ chosen { connector { compatible = "hdmi-connector"; - ddc-en-gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */ + ddc-en-gpios = <&pio PH 2 GPIO_ACTIVE_HIGH>; /* PH2 */ type = "a"; port { @@ -45,13 +45,13 @@ leds { power { label = "orangepi:red:power"; - gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */ + gpios = <&r_pio PL 4 GPIO_ACTIVE_HIGH>; /* PL4 */ default-state = "on"; }; status { label = "orangepi:green:status"; - gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */ + gpios = <&r_pio PL 7 GPIO_ACTIVE_HIGH>; /* PL7 */ }; }; @@ -88,7 +88,7 @@ wifi_pwrseq: wifi-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rtc 1>; clock-names = "ext_clock"; - reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */ + reset-gpios = <&r_pio PM 3 GPIO_ACTIVE_LOW>; /* PM3 */ post-power-on-delay-ms = <200>; }; }; @@ -130,7 +130,7 @@ hdmi_out_con: endpoint { &mmc0 { vmmc-supply = <®_cldo1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; /* PF6 */ bus-width = <4>; status = "okay"; }; @@ -316,9 +316,9 @@ bluetooth { compatible = "brcm,bcm4345c5"; clocks = <&rtc 1>; clock-names = "lpo"; - device-wakeup-gpios = <&r_pio 1 2 GPIO_ACTIVE_HIGH>; /* PM2 */ - host-wakeup-gpios = <&r_pio 1 1 GPIO_ACTIVE_HIGH>; /* PM1 */ - shutdown-gpios = <&r_pio 1 4 GPIO_ACTIVE_HIGH>; /* PM4 */ + device-wakeup-gpios = <&r_pio PM 2 GPIO_ACTIVE_HIGH>; /* PM2 */ + host-wakeup-gpios = <&r_pio PM 1 GPIO_ACTIVE_HIGH>; /* PM1 */ + shutdown-gpios = <&r_pio PM 4 GPIO_ACTIVE_HIGH>; /* PM4 */ max-speed = <1500000>; }; }; @@ -334,7 +334,7 @@ &usb2otg { }; &usb2phy { - usb0_id_det-gpios = <&pio 2 15 GPIO_ACTIVE_HIGH>; /* PC15 */ + usb0_id_det-gpios = <&pio PC 15 GPIO_ACTIVE_HIGH>; /* PC15 */ usb0_vbus-supply = <®_vcc5v>; usb3_vbus-supply = <®_vcc5v>; status = "okay"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts index e8770858b5d0..b78ed393d954 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts @@ -15,7 +15,7 @@ wifi_pwrseq: wifi_pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rtc 1>; clock-names = "ext_clock"; - reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */ + reset-gpios = <&r_pio PM 3 GPIO_ACTIVE_LOW>; /* PM3 */ post-power-on-delay-ms = <200>; }; }; @@ -66,9 +66,9 @@ bluetooth { compatible = "brcm,bcm4345c5"; clocks = <&rtc 1>; clock-names = "lpo"; - device-wakeup-gpios = <&r_pio 1 2 GPIO_ACTIVE_HIGH>; /* PM2 */ - host-wakeup-gpios = <&r_pio 1 1 GPIO_ACTIVE_HIGH>; /* PM1 */ - shutdown-gpios = <&r_pio 1 4 GPIO_ACTIVE_HIGH>; /* PM4 */ + device-wakeup-gpios = <&r_pio PM 2 GPIO_ACTIVE_HIGH>; /* PM2 */ + host-wakeup-gpios = <&r_pio PM 1 GPIO_ACTIVE_HIGH>; /* PM1 */ + shutdown-gpios = <&r_pio PM 4 GPIO_ACTIVE_HIGH>; /* PM4 */ max-speed = <1500000>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts index fceb298bfd53..e4f2ff19327b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts @@ -19,7 +19,7 @@ reg_gmac_3v3: gmac-3v3 { regulator-max-microvolt = <3300000>; startup-delay-us = <100000>; enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */ + gpio = <&pio PD 6 GPIO_ACTIVE_HIGH>; /* PD6 */ vin-supply = <®_aldo2>; }; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi index ebc120a9232f..47e6f4203c15 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi @@ -6,7 +6,7 @@ #include "sun50i-h6.dtsi" -#include +#include / { model = "OrangePi One Plus"; @@ -23,7 +23,7 @@ chosen { connector { compatible = "hdmi-connector"; type = "a"; - ddc-en-gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */ + ddc-en-gpios = <&pio PH 2 GPIO_ACTIVE_HIGH>; /* PH2 */ port { hdmi_con_in: endpoint { @@ -44,13 +44,13 @@ leds { power { label = "orangepi:red:power"; - gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */ + gpios = <&r_pio PL 4 GPIO_ACTIVE_HIGH>; /* PL4 */ default-state = "on"; }; status { label = "orangepi:green:status"; - gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */ + gpios = <&r_pio PL 7 GPIO_ACTIVE_HIGH>; /* PL7 */ }; }; @@ -93,7 +93,7 @@ hdmi_out_con: endpoint { &mmc0 { vmmc-supply = <®_cldo1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; bus-width = <4>; status = "okay"; }; @@ -261,7 +261,7 @@ &usb2otg { }; &usb2phy { - usb0_id_det-gpios = <&pio 2 6 GPIO_ACTIVE_HIGH>; /* PC6 */ + usb0_id_det-gpios = <&pio PC 6 GPIO_ACTIVE_HIGH>; /* PC6 */ usb0_vbus-supply = <®_vcc5v>; usb3_vbus-supply = <®_vcc5v>; status = "okay"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts index af85b2074867..642ed19d168b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts @@ -6,7 +6,7 @@ #include "sun50i-h6.dtsi" #include "sun50i-h6-cpu-opp.dtsi" -#include +#include / { model = "Pine H64 model A"; @@ -32,7 +32,7 @@ ext_osc32k: ext_osc32k_clk { hdmi_connector: connector { compatible = "hdmi-connector"; type = "a"; - ddc-en-gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */ + ddc-en-gpios = <&pio PH 2 GPIO_ACTIVE_HIGH>; /* PH2 */ port { hdmi_con_in: endpoint { @@ -46,17 +46,17 @@ leds { heartbeat { label = "pine-h64:green:heartbeat"; - gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */ + gpios = <&r_pio PL 4 GPIO_ACTIVE_HIGH>; /* PL4 */ }; link { label = "pine-h64:white:link"; - gpios = <&r_pio 0 3 GPIO_ACTIVE_HIGH>; /* PL3 */ + gpios = <&r_pio PL 3 GPIO_ACTIVE_HIGH>; /* PL3 */ }; status { label = "pine-h64:blue:status"; - gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */ + gpios = <&r_pio PL 7 GPIO_ACTIVE_HIGH>; /* PL7 */ }; }; @@ -66,7 +66,7 @@ reg_gmac_3v3: gmac-3v3 { regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; startup-delay-us = <100000>; - gpio = <&pio 2 16 GPIO_ACTIVE_HIGH>; + gpio = <&pio PC 16 GPIO_ACTIVE_HIGH>; enable-active-high; }; @@ -76,7 +76,7 @@ reg_usb_vbus: vbus { regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; startup-delay-us = <100000>; - gpio = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; + gpio = <&r_pio PL 5 GPIO_ACTIVE_HIGH>; enable-active-high; }; }; @@ -132,7 +132,7 @@ ext_rgmii_phy: ethernet-phy@1 { &mmc0 { vmmc-supply = <®_cldo1>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; bus-width = <4>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts index be81330db14f..95144ec0ac5a 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-tanix-tx6.dts @@ -6,7 +6,7 @@ #include "sun50i-h6.dtsi" #include "sun50i-h6-cpu-opp.dtsi" -#include +#include / { model = "Tanix TX6"; @@ -22,7 +22,7 @@ chosen { connector { compatible = "hdmi-connector"; - ddc-en-gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */ + ddc-en-gpios = <&pio PH 2 GPIO_ACTIVE_HIGH>; /* PH2 */ type = "a"; port { @@ -86,7 +86,7 @@ &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_vcc3v3>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + cd-gpios = <&pio PF 6 GPIO_ACTIVE_LOW>; bus-width = <4>; status = "okay"; };