From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2EEFC43603 for ; Wed, 11 Dec 2019 15:21:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7127208C3 for ; Wed, 11 Dec 2019 15:21:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077718; bh=p0rYq8DNTEvI2nZKWkRzFO8maTF/mCBCjUX9Fx7inuc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ejp+dOJ5TLGhCwjaNAxCMeXFcQaLcgCZNoeeTXfnvtkD7WwdN6z1l2tRh0vPBA1cV O0pWHAieEnmSbq3A2n4DPXPdP8UQpmMw0F0aYke7CRIMSof1rhOYGoNYEmm5Qp21AF fq0g7tEtAeGj3VMkok/AUn1ZCSJtVUpWS9ndWs4M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732549AbfLKPV5 (ORCPT ); Wed, 11 Dec 2019 10:21:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:52450 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731800AbfLKPV5 (ORCPT ); Wed, 11 Dec 2019 10:21:57 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E39C8214AF; Wed, 11 Dec 2019 15:21:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077716; bh=p0rYq8DNTEvI2nZKWkRzFO8maTF/mCBCjUX9Fx7inuc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1DENFKnz8WZ8253JjBAJp3mruhyYxpGacgQGK43ECkZOWiwruhYmEtoCDPTfKs5ms ZZ8Vnd7j9CBXHpZvxXMvCi9v4e7/q8V71IMNjBJP2zLOSF5lN3cMBrbfwph13h9pcj NHjKzPip5HBxRsNFHVJTIGgybLCCBVPq1nEyDCt0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Neil Armstrong , Kevin Hilman , Sasha Levin Subject: [PATCH 4.19 142/243] arm64: dts: meson-gxl-khadas-vim: fix GPIO lines names Date: Wed, 11 Dec 2019 16:05:04 +0100 Message-Id: <20191211150348.749585416@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Neil Armstrong [ Upstream commit 5b78012636f537344bd551934387f5772c38ba80 ] 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 Signed-off-by: Kevin Hilman Signed-off-by: Sasha Levin --- 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 d32cf38463702..864ef0111b01a 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.20.1