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: 10672171 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 3A173109C for ; Wed, 7 Nov 2018 10:46:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29C0E2B6A0 for ; Wed, 7 Nov 2018 10:46:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E1BF2B5FB; Wed, 7 Nov 2018 10:46:39 +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 C5A7D2B5FB for ; Wed, 7 Nov 2018 10:46:38 +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=PpUkY5koe3xCU7fRFmA06yNUZos1hVxC3Phcf9oULrY=; b=gj+v6ugYRl3eHsiiyNh5XJv1Va Vk2X3eZ/pIOjsRSCaprg7JTbPHZ/Sv7pCRgq7juGtrnzl9Ty+Tv6YY0umQ3Cpoo+e+NtTNq/zrWif GXIf3b8XP1WIBFvgTKg0TqwD/DyaQDnhKM0BtdsbTYL2M+Pi3utRZfAlDfWOfha2UT+Om+bpn5MZq 4VvxgX742wPimVkIDRGDR4U/RThzeg/5Out9vkNfSh8ZvZbKHb6FOh3FPKHnMOiZRwUe0cVtoO7o8 I3flXp9sTV6k8eJk6UB1fP3m40oyC4OPeHt/Lmh/un5svhSO0AW7gLM2TfsyyXbhM9mDrkmI8aCyx BF1OSmnw==; 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 1gKLLq-0004AS-7B; Wed, 07 Nov 2018 10:46:22 +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 1gKLLa-0003oi-TM for linux-arm-kernel@lists.infradead.org; Wed, 07 Nov 2018 10:46:08 +0000 Received: by mail-wr1-x441.google.com with SMTP id j26-v6so16874759wre.1 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=I50kjTp2vPiZUY8zn+FD6BuYFyeDrUcbRpx4B/BEcbtyH9pOOEBEObq88rmAZh3R9N cQ1xxeGgYVWSUE+XwUD/NrlOGiqlpTYNqX6sPAwoQTcUMxmc8ReVI/eNRhTDtAhFgw3o 5WjLpCW579RZP7+rMI1po68GiokYYcgRCBqnImszLtzLD+Oy591COq8UpwjAWy1R48q3 VUY17KvxswLt0bJ3mJBouI3jQVXuzXjibw8DAf5AWYU6hUTjA/n5vysvPRDfOdMmqluK r7vQ1LZuseiPz2v0c9Fp10IHs4uwnAdt2bwrnktLxe+biv2zOl5AQ872xs/ViLwrc3Qg saxg== X-Gm-Message-State: AGRZ1gItvw+nn1Py9lWwuwS/J86PSGTdW/IR8QFs2qgwRLU1gCmo8Jrl 80UIV4Kf7ga+Ikj+4J/+HRu/zw== 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_024606_941286_A46F0F60 X-CRM114-Status: GOOD ( 13.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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: 10672177 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 A080D109C for ; Wed, 7 Nov 2018 10:46:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88ABB2B8CE for ; Wed, 7 Nov 2018 10:46:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79C7C2B8D5; Wed, 7 Nov 2018 10:46:49 +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 1B52D2B8CE for ; Wed, 7 Nov 2018 10:46:49 +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=2i/ZFowaIP+RkVOvrkB4eHXiRDzFDrQBuM4EAq+TarE=; b=McKW14iK4TtkGVSWDEt5OaUuWJ N1Fx8hplLZA/hthyKBYY2qbnDoFjYYo9x8+/XfphDe1r/6HApvTOfyW/BnzEUgtd2Nnc9ZTXjo9n8 QO3lEMh3T++wiPm5Sa9L1EFiqMAGKPIuJzYOFQdDPa88qguIDx0NCdoLgHtYCGTr7ZGmmyNogbanO Siir9RJBdX2zSI7OhHeR6jxHB7Lb0sjN7B42vE9NN58l/Hp4eDMz1LDEQM6/FJv+YMVLwqbqZX2Cc 9f4K4/alm48Ckg6CGzdEElZ94a9W8quIvwnuKCO+2d0dBCECOj343Dg51XoQ5SrMPXdYnyydqtbVt Gf/pZ4Mg==; 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 1gKLMD-0004ii-0u; Wed, 07 Nov 2018 10:46:45 +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-0003ol-8f for linux-arm-kernel@lists.infradead.org; Wed, 07 Nov 2018 10:46:10 +0000 Received: by mail-wr1-x444.google.com with SMTP id j26-v6so16874793wre.1 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=JnPOrYrTlSDJ8RSCTwKNXtlv7ieqc8OkFicTM2GAM4ju8TRza4+kTtOEbxAbH7qJrp BQyex1VgtW3CihKpXQzV6wjZUA21n50HNIBwD1jzVF5+XzN0dE0J1fhIXch+EBF9pzF3 9nJTxIaoNnUmhkZygQi+/jzbps5IEl6iAH4Ar9N6JZo0FS8D+B/LS5ZQnmRxVtrqYIVQ ingnzkL4e6/31QT7l94Qaa+CG8PY31jubzUYVkhTYTobaB4ymDIGK9RZhcV++CTNnme4 LrFLIuVYjDg3u1n3tjkopjmxSzLlHum+M+lOofp+H7t8ybtL0YettkMCdQDptObFinlH JtvA== X-Gm-Message-State: AGRZ1gKHp5tl447mINMdwwMAu13VIP3ZIz+mcPnmJ+WxmoMF5Vu/v4rJ DdrOBwGjstXDeinN8OJxVqCnMQ== 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_321403_3F5533DE X-CRM114-Status: GOOD ( 14.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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: 10672179 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 7149B109C for ; Wed, 7 Nov 2018 10:47:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D76A2B8D4 for ; Wed, 7 Nov 2018 10:47:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DE2D2B8D7; Wed, 7 Nov 2018 10:47:12 +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 F10FA2B8D4 for ; Wed, 7 Nov 2018 10:47:11 +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=H72t4CRoAYhVJ6+rFITQcGcBsI5VBKw8u/Xb5q6TR04=; b=LEvGFnoZdf0vHNZxw7w/0akXIp 6LsvjGhAKHYfEpbta++tC1wxU4CCGNpO8sAxQ9beJ7VcMYBKk3SsgOzUlHsoq35sd/TpSfkU8iX1I cEw/JpNRjzzU7THUJzTtmW1ixxPyeDHOMks1raXOPEm96jxE/UnavwSDVOVJNAXTYCoAC1jrEmhJD zilhEM5xWu7+2eUnZk54ZoCTD5kkglkPIelNETnGSJiZ5O5tY7iAjg9EEkTTLrkuzVuLpwtZp2gsx DpuFbs1i70E3v8eTdWAAQZ9I/xjFQGiFrcILoEZSi6W8hjrUaU+/1IZZjmXOsBB0UydoTseJgTOYe RO5r5K0Q==; 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 1gKLMR-0004yW-KA; Wed, 07 Nov 2018 10:46:59 +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-0003om-7p for linux-arm-kernel@lists.infradead.org; Wed, 07 Nov 2018 10:46:11 +0000 Received: by mail-wr1-x444.google.com with SMTP id k15-v6so13872819wre.12 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=WJIiC43vuyTKzbSb1znpD0HbQNXQ8go8wBc5MNUGwRlXgJcYYpasp6EYCQDIpo+RNB 6P4N7ZMveIhhZRgHTs6c77TBSh7SYqa5+d6I09LOYvNmkFKYBwpB+R6qQxNeH8woQh8y z0gGNQmwhbrJbzDB0s8dBuhYhD5ZYws4yXq0eWgnd7RVjyaJPTd0Ja6yBFFxOrsVuQM/ ZcDk4M9QWDCHKpEeKB0fCXBloXpPe3Ab+3psIOdtgq0rOLQ/qLZAzLvllflbu8+18xd2 he7XaDoALDHDLtp/7MVp7FvsxDdVPeJWizWW9zKIN/OvwYAl+qivDqOyjzVphoO1LpUu OtdA== X-Gm-Message-State: AGRZ1gLnxkqpHn4kvJ+bPj4YfEwe4ms2uEFlg6QHlB70SMUPEYz7NcBe AijEuTR92vx82fTROA2eK+0R0w== 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_024608_307463_C1777A35 X-CRM114-Status: GOOD ( 14.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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: 10672173 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 A128E13AD for ; Wed, 7 Nov 2018 10:46:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 905D22B8CD for ; Wed, 7 Nov 2018 10:46:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83EBF2B8D4; Wed, 7 Nov 2018 10:46:43 +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 37A482B8CD for ; Wed, 7 Nov 2018 10:46:43 +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=ySt/GVZc3eodjvSvytPo5B+ycaVXNTVQZ31M4akC4O4=; b=YKvzJfDI9hjIdsTGSXwYf8VwkB XXieG6HOJmnSB+7KjsqQxtrVcTbfhx+tYIQTuc3e8UdDOxQullSTs8xZQFhU54n8KDDu2/koCyJCf sclXfvBuCLH+gnzL/tdNW5hWMmHKxfBJ6Ib3Kx11+cZbzvE8nn01Gt1zyHOD+JRewWmmTI4OTaXvD X583jeb0+tnpWNG+1Xkz0vnUvGlIizVX1CnxvKncGbXvzhJ0WYfWu/invVGYgkyWAb4mx/hwaNlDV OIAVaBxk63L2tvT7WwUFAxbXlH9LlKPfoymwFe5sDOCxA2r1KKo3BHKBClkBSoBc0pPQ0dEhH1ZrK NrUfklnw==; 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 1gKLM1-0004QF-CX; Wed, 07 Nov 2018 10:46:33 +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-0003oo-7m for linux-arm-kernel@lists.infradead.org; Wed, 07 Nov 2018 10:46:10 +0000 Received: by mail-wr1-x444.google.com with SMTP id o15-v6so13229228wrv.4 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=paEtT7V0aUhKgyeh7AfO968iDd7zW18/jXP0dZka7FmLZMKgTFa9oJ24MYtJkoFzKY MJvbmR587ukR+k/ZQEuv1V+B+jIoq7Rj2i3YLDxGUzq3QLiZkyo0M69Lb0A1jNtbtgQJ O1Jf7bzCHn2ZSQSW+1uoeRV18qi0R1mf5DCD+2L5dTD4xuP8G4Upl9N7NlNzcfhQEZeE exUSzBXhuiPHG2f54VqLmYBAZY/WzqfJd1gwsAyX+rkC8KMEpf6aMPpGwwlXXsPGB/cy q1ZfDYdABcW0I5OBCO/mJpWvi1wqHnRVOTMQngFJdC0rQIfSjN64402KlDJVxyNissjY hLxQ== X-Gm-Message-State: AGRZ1gIRD1xcW/xM/yJjjEQf7zs02MIzXA0SgsVOL45IsVVt1xCw4rsA UPUghuxF+mh95YgQldREsxWKgA== 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_286973_5399BB5A X-CRM114-Status: GOOD ( 13.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 */ "", "", "", "", "", "", "", "", "", "", "", "", "", "",