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 */ "", "", "", "", "", "", "", "", "", "", "", "", "", "",