From patchwork Wed Nov 7 10:45:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10672163 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 EE9D2109C for ; Wed, 7 Nov 2018 10:46:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DCBAB2B336 for ; Wed, 7 Nov 2018 10:46:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0FF42B6A0; Wed, 7 Nov 2018 10:46:17 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW 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 811D82B336 for ; Wed, 7 Nov 2018 10:46:17 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=nznUqd1Id5RVZ0SZ9fxjoA/KmC3YmR7JMrjBaXEQXBY=; b=eTGa+5dKXjDMOz4KQQRUKb7HJN XcGgQTEWtnh39LBHgXLBueT3OYFcKaj+EkfcdYmgS1gzCnS6+6sE+xT1aOpO3xY0w4ztGkT3BGUof WQF62CP6pK7RIBCH9ekRJRMidEWBoMDpwrKWqrlpCZc/8OnF0XAx5zI/no6GolopJt2/XK2pKt8Cb 0MlzAj+yPuRlNJiC2wNrhKKtRYaMV+ta6EC9PFSojibTLtAzZp1u68/BArdo4989pNr2hLp47UMIy MRjoHMab2N3zHfl62uT5XH8ial51NtnfACmFI4NYv7iHO40iQYVdGJspu5utgP8G5p6WyHNcA3sHi 4wOfiWpA==; 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 1gKLLj-00040v-2c; Wed, 07 Nov 2018 10:46:15 +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 1gKLLY-0003oj-TL for linux-amlogic@lists.infradead.org; Wed, 07 Nov 2018 10:46:06 +0000 Received: by mail-wr1-x442.google.com with SMTP id z13-v6so14474041wrs.3 for ; Wed, 07 Nov 2018 02:45:55 -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; bh=81OuEak8iRgJ5nMaLrOe/NOy/Pt6PWVxK92yf9sx1Rs=; b=v5+T1A7fOieQmi3s/ghb1mOxwtkMmnETMeDZrg10D6kNZs30tQ1xs0rm5BbrS3nJa+ CZkZIOZoGx73q/UkgCYqhtmLZtdeOIIYbfeaWspzOEFUpxrYXwaFcpoUZ/5ysyUblx9x Riu7CcmyxcSOQywxmdyjBaMRC5Hh2sUkJFzAKyJBHnBjQWE14/rZRJjOc7IjOa7NJSnu 3r+wSTYFAPAxgfIeGC5eda/1KJ5B6++TB7gkRJgf/c+EX0dnHCGigJcT3XRzOLypwSUT RGu6KhZ3NaQ+hIN+8kazocDyjdwCdzTFggJ+/Vi2fWWUpLdHBE5beqdun6H3bCVK7oxV Sd8w== 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=81OuEak8iRgJ5nMaLrOe/NOy/Pt6PWVxK92yf9sx1Rs=; b=UduDGv+taEIPaTmRKqYq8x+bknmctNlgaetZkiYyFgL1UQZRVz2B+0JSoy2eyov0DD q0QLeQB22EGSSW5l+pfeoCnbb3WUGladG2TO2hYzWwVu/JBf3gk+7G9XznmGgklzXxf9 TSA+0o3+8R1AGXuL9HInNi4Tf9ZG9KOPLoqQN9hdxXH5Bv9XLC3w76Hok00a34JtVoOG bPDm1caEY5fQ8qSo+LnVDdIHCSnu/Aqb7TQqkZLuk21F4pqNqgWHhEB1maGn1AffUWcz 3loS3Rrp7u683vlGqEHdAvw3sZbeVqIKbb19SF3HhCHFoTkaO7wwzGYXY6IWXY/DFWfL p6yA== X-Gm-Message-State: AGRZ1gKLQhJdbC8JH0h3PomkTfPGHNUS1LbvnddHePq092Wxt3Gbv7Wp KeYb92J9/j1rbBuyYBladCoiWg== X-Google-Smtp-Source: AJdET5fGerIZe5fMgMCQIhjaoWJP49g6VeAE62A5V5PsIebYm/pFd96o4KBkTcfDETZbtjkWp5LI2A== X-Received: by 2002:adf:90d0:: with SMTP id i74-v6mr1328083wri.181.1541587553886; Wed, 07 Nov 2018 02:45:53 -0800 (PST) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id h125-v6sm314484wmf.48.2018.11.07.02.45.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Nov 2018 02:45:53 -0800 (PST) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 1/4] arm64: dts: meson-gxl-libretech-cc: fix GPIO lines names Date: Wed, 7 Nov 2018 11:45:47 +0100 Message-Id: <1541587550-17842-2-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541587550-17842-1-git-send-email-narmstrong@baylibre.com> References: <1541587550-17842-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181107_024604_952261_CE73CD82 X-CRM114-Status: GOOD ( 11.80 ) 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, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong 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 The gpio line names were set in the pinctrl node instead of the gpio node, at the time it was merged, it worked, but was obviously wrong. This patch moves the properties to the gpio nodes. Fixes: 47884c5c746e ("ARM64: dts: meson-gxl-libretech-cc: Add GPIO lines names") Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts index 90a56af..b4dfb9a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts @@ -163,7 +163,7 @@ }; }; -&pinctrl_aobus { +&gpio_ao { gpio-line-names = "UART TX", "UART RX", "Blue LED", @@ -178,7 +178,7 @@ "7J1 Header Pin15"; }; -&pinctrl_periphs { +&gpio { gpio-line-names = /* Bank GPIOZ */ "", "", "", "", "", "", "", "", "", "", "", "", "", "", From patchwork Wed Nov 7 10:45:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10672169 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 CE9FB13AD for ; Wed, 7 Nov 2018 10:46:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD32D2B336 for ; Wed, 7 Nov 2018 10:46:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B151D2B879; Wed, 7 Nov 2018 10:46:32 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW 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 556392B336 for ; Wed, 7 Nov 2018 10:46:32 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=mrtCs4HyHJLJnIzw8XTLhbbKrDuZN0pgg2hkhnRG/3I=; b=U2CODQz0i+m3xQVTPgRF6kwrAm eRWYjM4wWgFssBR5UE3rNhDQOSPQhnI/jZPVK3HaOw/hfsnlb8UNgnGqRqcBHsosBiYkF3dEMs72U oXaaiAXYl+C0SDTYO5ckk2U8Mt30H7D9jSPgIxoOpmDk+p0SwDq6EWKpORZBTPFTZbF/UbQdcHeV4 +trLy+soFnduE6IetyfCUU7d0TeRy9d4htBMSOGZNp2ZeFbZP91exgA1I1xFjan9MdlTlaKJGJj/t nkyIByxLTGn185+1la4+9FzYbg+UFH2IZ4ZxziIoS4JNNXqr2Cf8Daapp31pbif1kpfIIewFA6400 GFebTjNA==; 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 1gKLLy-0004Nm-Dm; Wed, 07 Nov 2018 10:46:30 +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 1gKLLc-0003ok-7x for linux-amlogic@lists.infradead.org; Wed, 07 Nov 2018 10:46:10 +0000 Received: by mail-wr1-x443.google.com with SMTP id o15-v6so13229149wrv.4 for ; Wed, 07 Nov 2018 02:45:56 -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; bh=oDvrfbacJdsErfvUwczsXd6Iu3OXG1SVdyAW6rxRLeo=; b=OZcyTjE5tb8z5S2KEe54rXZvrK/9NmQQVN2AzLbMjk/y4P10T/KQ76lMHATp0yiBAd eCqMEbe47dbDHI/7t3t/7qZaBPtYXrhQSZ25ofQvcF1OBUObhYE8jpp1+AzW0JgSiu9g 4HoxK6GlxqqQD97VAql0793PUslT6IaWAqbEq9icDX0131TUbtBzWOliLAPmsE9pWdn2 W7mbZDpO4zCDhlYfxcwF5CPNu9Y3pGo9qq7krr8iq5jo+WhpaTjhmTwjcL3LuLK0eecz ffz2u+OS6hOjBGR2cSFc6f6i4ha8kTeN9GZy3mRVCR+hFinHqZt6nuzZcHgqSkCxF7Nt Ng9A== 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=oDvrfbacJdsErfvUwczsXd6Iu3OXG1SVdyAW6rxRLeo=; b=o+Cet21JOhVAepU3TsPDp/bvKcLorxrG11dALQhZWyDmiWJ9W2Sfu0+HY2CfI62m9o FJTNsAzl8TjTiHWxEd1ph3fLnHAfVa5+2pX5RqBNAPaehKNvGqtyesXQPsrc2yp2Vr2S Mr03CpayLCFmCUWV/TmMUMhM6HqCgXUuBTFG1eCC9OTdEPhHEr/A8naj/VMrc/YMsFkc 8P5LvHJ7YJT5T6bwOeJCT3C3NKUnO9RHkOKyqhaNCqdkEY8Cb2scdQQXjcKrlwdQN9TO co1ajjnlrCN82SrBRfSkuys3XB70JBlVauPL79EXa3XjQZqhzh7JInIayqPUELtpeR+T seQg== X-Gm-Message-State: AGRZ1gKbFg7ARpJyIPdzQlJ++Lzf5cPqJ8ktPyASKBW1pdTX0Je18Ft9 TBfZiXZ0b1bxdPfIxLxzg99e5w== X-Google-Smtp-Source: AJdET5eRpeTh9U5gCZChtc4zXdgJUEGiCQiGNB+Q1pCZhID8gYt5hpmvnn6xjWNSJIRnGJ8c7sZ0rg== X-Received: by 2002:adf:a78a:: with SMTP id j10-v6mr1450350wrc.286.1541587554585; Wed, 07 Nov 2018 02:45:54 -0800 (PST) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id h125-v6sm314484wmf.48.2018.11.07.02.45.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Nov 2018 02:45:54 -0800 (PST) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 2/4] arm64: dts: meson-gxbb-nanopi-k2: fix GPIO lines names Date: Wed, 7 Nov 2018 11:45:48 +0100 Message-Id: <1541587550-17842-3-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541587550-17842-1-git-send-email-narmstrong@baylibre.com> References: <1541587550-17842-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181107_024608_342451_EDE2FF51 X-CRM114-Status: GOOD ( 12.35 ) 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, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong 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 The gpio line names were set in the pinctrl node instead of the gpio node, at the time it was merged, it worked, but was obviously wrong. This patch moves the properties to the gpio nodes. Fixes: 12ada0513d7a ("ARM64: dts: meson-gxbb-nanopi-k2: Add GPIO lines names") Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts index cbe99bd..8cd50b7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts @@ -191,7 +191,7 @@ pinctrl-names = "default"; }; -&pinctrl_aobus { +&gpio_ao { gpio-line-names = "UART TX", "UART RX", "Power Control", "Power Key In", "VCCK En", "CON1 Header Pin31", "I2S Header Pin6", "IR In", "I2S Header Pin7", @@ -201,7 +201,7 @@ ""; }; -&pinctrl_periphs { +&gpio { gpio-line-names = /* Bank GPIOZ */ "Eth MDIO", "Eth MDC", "Eth RGMII RX Clk", "Eth RX DV", "Eth RX D0", "Eth RX D1", "Eth RX D2", From patchwork Wed Nov 7 10:45:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10672165 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 A9E06109C for ; Wed, 7 Nov 2018 10:46:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 981392B5FB for ; Wed, 7 Nov 2018 10:46:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C0042B879; Wed, 7 Nov 2018 10:46:20 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW 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 40D472B5FB for ; Wed, 7 Nov 2018 10:46:20 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=Yr7W+A3jShD4Fr7bNTp4Z2loZaHvwTGO7b4Jm5wpqdM=; b=F9xvDWKAaU4gChVObXCJiw8NSe sCwRjcqQzsTbsCIu6hXwj5BuT3H/s0rLWyGefQh5eRlXtidIfJkVS+jVqUX06BAWgHu47iYrbuf2k AkkPl/PaYR/Puco9IUzDr+nBRp+rmg8OgW6nsmMGruITxyE6eZgvBeKj9o5QCDQWgsKcJRXv7Li3z UPHvu7U5KixwQBNBwpxajSx7WAlNthStqgQ6mOw6Ek+lKL4JIMaw0HBAeOK2ASdEW/MIBUJCiNJyV W3cbKhXLHlvsH5N2QWFmReTxjz74AccOA1UsBAdoomypvNWoGioDqPfwCxMDgc3jdQ5NubdCtz/pL 8uQMU6BA==; 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 1gKLLl-00043d-IS; Wed, 07 Nov 2018 10:46:17 +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 1gKLLY-0003on-TJ for linux-amlogic@lists.infradead.org; Wed, 07 Nov 2018 10:46:07 +0000 Received: by mail-wr1-x442.google.com with SMTP id x12-v6so16844227wrw.8 for ; Wed, 07 Nov 2018 02:45:56 -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; bh=TtiQgLxeB3Vvn/F2D6s5fJLLQl7t/5akjyB6egj8ywA=; b=0zhyZrs1I3b3f94v43giJ2+xKNtpj+u2i222TmZvKBZx4aozIM+K/TtJpf4qQp1923 ue+riMpQtEfF/we1Jbyyujh7eic8rEfHuH8/tO23R11rl2+4gEmTCuf0IrzIh6u2M6FX QhRrSWdrE/NN8K3dqGYniVltQGAuxSwTsA41Q8b9VxHdW8a7PJOmCuP+mvE7dZHLIHI1 qQ+8dEEVxHT9SwaJJesig8VAQJTcnWtI1ps2t/wqOZ9P/JriHWYFdHu76btBvHTPTYRk iDKtJRdQOzXwqYLbaqsSMcIT0tT0dUHe5tmcyc4HKokqBswfdCMB4ZqJEev7WKOXQLlN hFvQ== 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=TtiQgLxeB3Vvn/F2D6s5fJLLQl7t/5akjyB6egj8ywA=; b=IEcLNwZNYt8z/QSzclb/L+PSLXZ3lzh3CAR+FE2fudgLupaOjGYkFttru1rfeTHaIE sPo+FKkYxGkce0psTVwtYYFbCu3KNrGlNw946jkmNFOdbPsMBdRMzW6PwTHD1vF9ZU/B C0aR7qF1TG872yJ2DbjAgkq9PL5XnflLVq4GyW0VXEGFgTxonjm2J/LFQ3tgaF1Eiz2S BslmJF+0xKnosnANz2yV98NSa5F/5X8ZBH0XthFKIhYylLWaICeEilWsJ+m3YqdtMI6D GVlB0P9ERenQS+ehG3kgTc3nSCPeqlsHKhs4N60TAZJvg6UgTsUswHCk4lAj82E/ugC9 MxZQ== X-Gm-Message-State: AGRZ1gI/y1GbGBBFi2mo5N1txw7SxWpZBocXbbdFqLqeb08lEFRPhOnd gMC0Ls3436lRx7hXEO7SgpUGwg== X-Google-Smtp-Source: AJdET5eWHJ7knPhvjHNh3UKLjisXjHbWEAIrvKWOLYMndyy0oF+BEyD9Luy9btlXwSU3dpxlwRhjsw== X-Received: by 2002:a5d:4012:: with SMTP id n18-v6mr1321656wrp.185.1541587555294; Wed, 07 Nov 2018 02:45:55 -0800 (PST) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id h125-v6sm314484wmf.48.2018.11.07.02.45.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Nov 2018 02:45:54 -0800 (PST) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 3/4] arm64: dts: meson-gxbb-odroidc2: fix GPIO lines names Date: Wed, 7 Nov 2018 11:45:49 +0100 Message-Id: <1541587550-17842-4-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541587550-17842-1-git-send-email-narmstrong@baylibre.com> References: <1541587550-17842-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181107_024604_950905_EB9CFCB7 X-CRM114-Status: GOOD ( 12.45 ) 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, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong 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 The gpio line names were set in the pinctrl node instead of the gpio node, at the time it was merged, it worked, but was obviously wrong. This patch moves the properties to the gpio nodes. Fixes: b03c7d6438bb ("ARM64: dts: meson-gxbb-odroidc2: Add GPIO lines names") Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts index 54954b3..00f7be6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -187,7 +187,7 @@ pinctrl-names = "default"; }; -&pinctrl_aobus { +&gpio_ao { gpio-line-names = "UART TX", "UART RX", "VCCK En", "TF 3V3/1V8 En", "USB HUB nRESET", "USB OTG Power En", "J7 Header Pin2", "IR In", "J7 Header Pin4", @@ -197,7 +197,7 @@ ""; }; -&pinctrl_periphs { +&gpio { gpio-line-names = /* Bank GPIOZ */ "Eth MDIO", "Eth MDC", "Eth RGMII RX Clk", "Eth RX DV", "Eth RX D0", "Eth RX D1", "Eth RX D2", From patchwork Wed Nov 7 10:45:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10672175 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 8629913AD for ; Wed, 7 Nov 2018 10:46:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 743FB2B8CD for ; Wed, 7 Nov 2018 10:46:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 686392B8D4; Wed, 7 Nov 2018 10:46:45 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW 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 3E6DE2B8CD for ; Wed, 7 Nov 2018 10:46:44 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=t6CppZJTwsl2J1YW3cr9rMYUj0TjUIcQVN75SXXs/Eo=; b=azdGwKVFfRbnOfNxdCxprlClQy SxKPlhiGHPnFBqLIxSMtRL11qK1EAx708aGf0+Mz8YENWUKtBVz+4PPEMpAUmVnTH6um7HSzP3AqS +urghEidlznyXRgXCfoXm6Iw0wt//GPiSycwnndniB6cRRxlxy68eKoenOS9hBz/LI6k/5ree32PI Fhi3cAGpZO2ATUnyXp0xfTRKY+hKTk1SKzbYftgf+pujLCVgU0/1Vptpl0rKTYMtvHcOxKonfEt8d hGfRFKDggbX4eQ5MB2wrj4I6lE4ZGc5xH1N+w48K4Jg+8c9Z5TUlKBJDyRVZMZ/FN3kHqGpF26QYO Z4Ppfgxw==; 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 1gKLMA-0004fl-4x; Wed, 07 Nov 2018 10:46:42 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKLLc-0003op-8j for linux-amlogic@lists.infradead.org; Wed, 07 Nov 2018 10:46:10 +0000 Received: by mail-wr1-x444.google.com with SMTP id u9-v6so6508979wrr.0 for ; Wed, 07 Nov 2018 02:45:57 -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; bh=tiSj3kDDE5MLQh1ftvIa3L3YTabjXeVmy/fJcc/8Cvw=; b=oqM7QLXTbtYihkAzoqMnb8o8pyNi+btsFS4YeFdiyUZ++Pesf42hvYLaksXFRhJrch FnLF5bko9PkjeeSA76Fv5sqXw4nnx02roadBzQzgnJDW1HlrA/NBMBGVMp93qeIZWMvX 7CmN06MFCEpHOnMZIVuMURZAW2BTKn5VCeLHhr5sJJGqleP4LPKD9vqPRsOnbXFWQFGT MN2tWEKCJ6b5JRWFuRCMjWLBiguWaNZR9WD+pClTWCBzinb4yFuvxoJ25nUjkKAWlb6J o4wwoV0Ja0cTDYXn4RkKdIU275mCKgrtY7WiJVi8Q4LRhJ5Wq6Qb4L8QbWjZGxjtV+TF OkBQ== 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=tiSj3kDDE5MLQh1ftvIa3L3YTabjXeVmy/fJcc/8Cvw=; b=gs+jqm3FTTPiWLwhFDec32fVRBkfzj9y8fj8F6isOvfCf//vr+b/mFHJ6pZ8ljSxFh rDbQ1pxd1bWJc2+GJRfQ5WOxEwpzwFO0NpxgJ1F3xJ3X15WNQGQ/TfLrHQXhN7ThV/ZP m3av58WQeIaJ/Kv6McPIUzhh9PbGYkYlW1YRht3x95Q0urxPl0VAiWfKMNCMUUpXgVJ0 FByQe5/lnFm8+u/eRWwHX2nQA47Hy5oOsNx13WeHUWzFciZxEZpw3cYzRd/llhw1iMHM DZXkCSkSzwMdZ407JIBmDT+3l5h0A8vnW6oXCyEsBUThvakBz1g1ae3kHD79jxgmS/4t NGsA== X-Gm-Message-State: AGRZ1gKD5205BzkuK6s73JLfhrnGgWaT/w7YhV2b5wrl106XMX4RwADQ 0/WDAfO/q4w12sKNkwIq0uNxtg== X-Google-Smtp-Source: AJdET5cjDte5GZfyzKPi81x6f6m0IsnVT49JXDgbx8HFcmskutRp55KLjrZX+xiMngthMzlN3Cq+Nw== X-Received: by 2002:a5d:4e83:: with SMTP id e3-v6mr1448180wru.187.1541587556010; Wed, 07 Nov 2018 02:45:56 -0800 (PST) Received: from bender.baylibre.local ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id h125-v6sm314484wmf.48.2018.11.07.02.45.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Nov 2018 02:45:55 -0800 (PST) From: Neil Armstrong To: khilman@baylibre.com Subject: [PATCH 4/4] arm64: dts: meson-gxl-khadas-vim: fix GPIO lines names Date: Wed, 7 Nov 2018 11:45:50 +0100 Message-Id: <1541587550-17842-5-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541587550-17842-1-git-send-email-narmstrong@baylibre.com> References: <1541587550-17842-1-git-send-email-narmstrong@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181107_024608_345448_333485ED X-CRM114-Status: GOOD ( 12.04 ) 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, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong 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 The gpio line names were set in the pinctrl node instead of the gpio node, at the time it was merged, it worked, but was obviously wrong. This patch moves the properties to the gpio nodes. Fixes: 60795933b709 ("ARM64: dts: meson-gxl-khadas-vim: Add GPIO lines names") Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts index d32cf38..864ef01 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts @@ -112,7 +112,7 @@ linux,rc-map-name = "rc-geekbox"; }; -&pinctrl_aobus { +&gpio_ao { gpio-line-names = "UART TX", "UART RX", "Power Key In", @@ -127,7 +127,7 @@ ""; }; -&pinctrl_periphs { +&gpio { gpio-line-names = /* Bank GPIOZ */ "", "", "", "", "", "", "", "", "", "", "", "", "", "",