Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2970106imu; Wed, 7 Nov 2018 02:46:38 -0800 (PST) X-Google-Smtp-Source: AJdET5cgYwrZWWtXHRc8VpYLdXYMjOt7hHdb+2AuDf5EPbPeJKJkOCzcF+VI1GJU0/9agKeJkPOX X-Received: by 2002:a63:585c:: with SMTP id i28mr1142856pgm.178.1541587598418; Wed, 07 Nov 2018 02:46:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541587598; cv=none; d=google.com; s=arc-20160816; b=qpaJlz1jmAOVpmbcv/0F5TQpI4e74GnBEDgw94mrWXebqR/P4FtKS3FiqX4gCm7tgq GZte/lRZPQbs5ggVpgnsgqEUcEyjpno7hRo01QMFpN5lewAP4WL3oKfVMFG9da8Qh0Lc WZVgjMmx7XD7Xctu4MYB6dbquTn/MujqB1f4sy5++eDWLPyrhdHnI/uvw5fEIZq3K89p gNRCZ2ba4SzhtMAO4pnAHltAzdqm2/K51tepXhAcOM3Qzb/YcqF61Few3zxh1jrST2G8 af5oD2bofN7EkAmz9EKvryjhGrp26x55+FJEz7sCib/xmr5RhKci9QGxPAHfr6BSm1wr d8LA== 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=tiSj3kDDE5MLQh1ftvIa3L3YTabjXeVmy/fJcc/8Cvw=; b=Oo8f8fgef65LjzKITDm6rUzsblJNFaW4RGfPBc9gPmFwETwKC9yuA1a5pVVl9knewa F/qDuhKd/XhPUq4v55j04crQ7tlutDBZ2MuQ0MEkB1EQlkNEBTjZOFil4vOT85egeWPQ vo+yU9Gsq6JCMAL17UOq9rWZO1yclvvkAvP+FGkCYB84Yqg0dyCOqOV9MNXWQumuhR7U VnXLKUJDJ9VU2O8ijtx6ZFjv8lsX3FaIxBqzIv6eRH27E9lyCb1uWz9KX2r6GRIhBms5 vMnrev3qvut49pi8LnydfvjxZ84VYMheg9j2i4u9Y7BLSDKQrb9GKkoLGpvUGmUkHS8D 5fQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=oqM7QLXT; 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 j5-v6si236234pfb.211.2018.11.07.02.46.23; Wed, 07 Nov 2018 02:46:38 -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=oqM7QLXT; 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 S1730752AbeKGUPs (ORCPT + 99 others); Wed, 7 Nov 2018 15:15:48 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:44930 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730569AbeKGUPp (ORCPT ); Wed, 7 Nov 2018 15:15:45 -0500 Received: by mail-wr1-f66.google.com with SMTP id j17-v6so11710975wrq.11 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=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=CiTh65fCO3oEwPq4c1c4dndLEzN++hnrRGSHLNLwShQCamNTfOQp52D8p8my4BmmuW QYftILuARRXLvAr/m+Hi8xdx2W/jS8W75n+uldHqsAtqksuEE1Sici+vkxBAP6OoSVmP VnUMh1Jt5MowV1XhPiiF+ZuXdAuWSRzmQLXCQBmLjCf3dddK+pERmiTuliZQ/FPDdMj+ MQ8CvYHcbCGDRWMm2TS6swLbu/EkayL4HhpMXRvvQrjLObZJ8KhhOkKKfmzOHtGOnB3Y ojYPl8qQgOtMBny0zz52xzOPEMMJl0yoKdrqciUS2vVjSJQeZcxTYOyiSBJf4Q2QP/l7 /doA== X-Gm-Message-State: AGRZ1gJS2YhNTqzh5ZuPg86s2bUH0ENJqatSYMSzqCgPkzxPVQSFPKPr sKPZpX83QglkrM6Jf8X+ckdeyw== 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 Cc: Neil Armstrong , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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> 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: 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 */ "", "", "", "", "", "", "", "", "", "", "", "", "", "", -- 2.7.4