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,USER_AGENT_GIT autolearn=unavailable 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 BF5FCC43603 for ; Mon, 16 Dec 2019 18:48:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F3852082E for ; Mon, 16 Dec 2019 18:48:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576522133; bh=l+iuQlcezMBd/7Et/nhWonLvMUief6HtBQvhF9FLr0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=O2rRNBeudaOFkuKzAlUG7KznycYMAqZt6Mw7is6Cs000HSPfMtrlcKm91JkXUKVYj inQdi5vXgq4JvY5/p4mnkccyp99zBcsOJYtwauLgRJrSv2FiYpGcKAAe2VLoM2YZ4G KYXP4Gn5GgLWmKiEPuMKcbk2mGevnsUhfvU1E0sI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727836AbfLPRxz (ORCPT ); Mon, 16 Dec 2019 12:53:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:48670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727826AbfLPRxv (ORCPT ); Mon, 16 Dec 2019 12:53:51 -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 E430120733; Mon, 16 Dec 2019 17:53:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576518830; bh=l+iuQlcezMBd/7Et/nhWonLvMUief6HtBQvhF9FLr0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JPNLy/OetpZOBSW3Mp+SXbO8+yzYq4DJ7/4y56fJGTL9EAPcEyFDQDP9BKHEcwj2U PBbDXaD3EEMtjAPQjhDr++R+6I7jd5eu6QrA5a6ubM+jG8sb37q266xO8fZNfo+30n lBZAM15hPHdYNfmDkfqWt1+4tYCAgNNdh8CMO4h8= 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.14 084/267] arm64: dts: meson-gxl-libretech-cc: fix GPIO lines names Date: Mon, 16 Dec 2019 18:46:50 +0100 Message-Id: <20191216174857.585681299@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174848.701533383@linuxfoundation.org> References: <20191216174848.701533383@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 11fa9774612decea87144d7f950a9c53a4fe3050 ] 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 Signed-off-by: Kevin Hilman Signed-off-by: Sasha Levin --- 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 0814b6b29b86a..e2c71753e3278 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 @@ -139,7 +139,7 @@ }; }; -&pinctrl_aobus { +&gpio_ao { gpio-line-names = "UART TX", "UART RX", "Blue LED", @@ -152,7 +152,7 @@ "7J1 Header Pin13"; }; -&pinctrl_periphs { +&gpio { gpio-line-names = /* Bank GPIOZ */ "", "", "", "", "", "", "", "", "", "", "", "", "", "", -- 2.20.1