Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2970043imu; Wed, 7 Nov 2018 02:46:34 -0800 (PST) X-Google-Smtp-Source: AJdET5eHh9eZgA+eaPF1W61uzkONP7hnpFCuVKUU1vBoOcxCPuKT/OatlJ4SHsaTQOrnVlktxXp9 X-Received: by 2002:a17:902:3084:: with SMTP id v4-v6mr1360287plb.326.1541587594396; Wed, 07 Nov 2018 02:46:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541587594; cv=none; d=google.com; s=arc-20160816; b=Irae4uycOXZHaMP5oh+vXjmEG98HsJ4jsHkIIQWQ01JTPK9aun4iiDKViUklQ/2uoc ep9HGC3nWERM50r7xjalX7R9QFQd22iQh8WndQaV0Fa1Iq8//dsM5cYarsPjLZku6cjh pMx2Rbg9f/bLe2l0ilcsoCBlYNe9OpZvcw7Y+v8rCmt+smhzARHui+1P21WXsWDTlHTF +ItVTqhaJuL7TCSzC2N8ds6xO+T7Z+tfOKJnWRfrYjgwekNPuwo3p5PSSK9dRf6Se0sc u6CgihSb1IDbEj4RgvXKlz0BSSOhUZOg5X7hpBB/DKzj6ApujvykJCVWe1hGxhDFlfwj Oujg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=oDvrfbacJdsErfvUwczsXd6Iu3OXG1SVdyAW6rxRLeo=; b=iCHLN4fjGdghw229YjVKeKn7NIY/d2G1Y+4OR9YVj0fvV1vCPKi6/xEaCVMq4XpoeQ fC/RI9TnNDGcyL+mvOjyiHfDm26eDw/GhZaMGyhoMFsp7Tv3Nnc5TcERcPjxYAw0D7zv LWxHwnWsIx4zPhPqSsLNeESbbwQs1lttiIbChpPZ0vpaTM0mu/kH+GFNA36OjNPTx7r5 rt+UcRuyC2TuAo4hdTAfwyvXWENf2dkQiCAjqA/kFepowNat2ePxVkDym6ZW5R+/C+QI ipH4rsdZM3DriIxwtlK6ReTvcHgLZw6vnexw7hWv+I+BnX8SWm3HLJbpdODfyanxt6J7 PlSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=OZcyTjE5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h70si219694pge.221.2018.11.07.02.46.19; Wed, 07 Nov 2018 02:46:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=OZcyTjE5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730652AbeKGUPp (ORCPT + 99 others); Wed, 7 Nov 2018 15:15:45 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:35317 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726218AbeKGUPo (ORCPT ); Wed, 7 Nov 2018 15:15:44 -0500 Received: by mail-wr1-f68.google.com with SMTP id z16-v6so16868668wrv.2 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=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=UQCsKo45+OYbMSAuMnodWF1xp4NuwqeETaynbH/Z0dLCo8m+StEqvbIXpfFJd6Kn7p DH2gyuynlqJUspDLgNyKi+vvOlKeSJu2YkDlPfezRJHtcGXCosS9ovs9+RA5Eg7WDA1u 9u7/r68PsgIzMKyHWr5B33nYi3D/K5zfl8+Pdb7pSPSFnKdF8rwd2BpdEwTSCRwNJumo pbsvuVhdoiyrgGtaAEN0gHUKJE4aHCO67u52vSfnU/qe0cMfQ2DpJK2iM3yAFgfdWhBM B/E0P9jsgdqkeO9o00PXGc7RLLAisErVh84/53hipnc88OpJ6R+KvNJrgz0g8uvSLrzG PHAA== X-Gm-Message-State: AGRZ1gLooQI6PHQfvHss+dI/zcSDZVcmAAkKamZlJYhp6xpzTEijUdjx UL1HHnauOBods5jiNMV8h2pnRA== 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 Cc: Neil Armstrong , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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", -- 2.7.4