From patchwork Wed Nov 7 10:45:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10672179 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 7149B109C for ; Wed, 7 Nov 2018 10:47:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D76A2B8D4 for ; Wed, 7 Nov 2018 10:47:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DE2D2B8D7; Wed, 7 Nov 2018 10:47:12 +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 F10FA2B8D4 for ; Wed, 7 Nov 2018 10:47:11 +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=H72t4CRoAYhVJ6+rFITQcGcBsI5VBKw8u/Xb5q6TR04=; b=LEvGFnoZdf0vHNZxw7w/0akXIp 6LsvjGhAKHYfEpbta++tC1wxU4CCGNpO8sAxQ9beJ7VcMYBKk3SsgOzUlHsoq35sd/TpSfkU8iX1I cEw/JpNRjzzU7THUJzTtmW1ixxPyeDHOMks1raXOPEm96jxE/UnavwSDVOVJNAXTYCoAC1jrEmhJD zilhEM5xWu7+2eUnZk54ZoCTD5kkglkPIelNETnGSJiZ5O5tY7iAjg9EEkTTLrkuzVuLpwtZp2gsx DpuFbs1i70E3v8eTdWAAQZ9I/xjFQGiFrcILoEZSi6W8hjrUaU+/1IZZjmXOsBB0UydoTseJgTOYe RO5r5K0Q==; 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 1gKLMR-0004yW-KA; Wed, 07 Nov 2018 10:46:59 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKLLc-0003om-7p for linux-arm-kernel@lists.infradead.org; Wed, 07 Nov 2018 10:46:11 +0000 Received: by mail-wr1-x444.google.com with SMTP id k15-v6so13872819wre.12 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=TtiQgLxeB3Vvn/F2D6s5fJLLQl7t/5akjyB6egj8ywA=; b=0zhyZrs1I3b3f94v43giJ2+xKNtpj+u2i222TmZvKBZx4aozIM+K/TtJpf4qQp1923 ue+riMpQtEfF/we1Jbyyujh7eic8rEfHuH8/tO23R11rl2+4gEmTCuf0IrzIh6u2M6FX QhRrSWdrE/NN8K3dqGYniVltQGAuxSwTsA41Q8b9VxHdW8a7PJOmCuP+mvE7dZHLIHI1 qQ+8dEEVxHT9SwaJJesig8VAQJTcnWtI1ps2t/wqOZ9P/JriHWYFdHu76btBvHTPTYRk iDKtJRdQOzXwqYLbaqsSMcIT0tT0dUHe5tmcyc4HKokqBswfdCMB4ZqJEev7WKOXQLlN hFvQ== 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=TtiQgLxeB3Vvn/F2D6s5fJLLQl7t/5akjyB6egj8ywA=; b=WJIiC43vuyTKzbSb1znpD0HbQNXQ8go8wBc5MNUGwRlXgJcYYpasp6EYCQDIpo+RNB 6P4N7ZMveIhhZRgHTs6c77TBSh7SYqa5+d6I09LOYvNmkFKYBwpB+R6qQxNeH8woQh8y z0gGNQmwhbrJbzDB0s8dBuhYhD5ZYws4yXq0eWgnd7RVjyaJPTd0Ja6yBFFxOrsVuQM/ ZcDk4M9QWDCHKpEeKB0fCXBloXpPe3Ab+3psIOdtgq0rOLQ/qLZAzLvllflbu8+18xd2 he7XaDoALDHDLtp/7MVp7FvsxDdVPeJWizWW9zKIN/OvwYAl+qivDqOyjzVphoO1LpUu OtdA== X-Gm-Message-State: AGRZ1gLnxkqpHn4kvJ+bPj4YfEwe4ms2uEFlg6QHlB70SMUPEYz7NcBe AijEuTR92vx82fTROA2eK+0R0w== X-Google-Smtp-Source: AJdET5eWHJ7knPhvjHNh3UKLjisXjHbWEAIrvKWOLYMndyy0oF+BEyD9Luy9btlXwSU3dpxlwRhjsw== X-Received: by 2002:a5d:4012:: with SMTP id n18-v6mr1321656wrp.185.1541587555294; Wed, 07 Nov 2018 02:45:55 -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.54 (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 Subject: [PATCH 3/4] arm64: dts: meson-gxbb-odroidc2: fix GPIO lines names Date: Wed, 7 Nov 2018 11:45:49 +0100 Message-Id: <1541587550-17842-4-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_024608_307463_C1777A35 X-CRM114-Status: GOOD ( 14.32 ) 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: b03c7d6438bb ("ARM64: dts: meson-gxbb-odroidc2: Add GPIO lines names") Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts index 54954b3..00f7be6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -187,7 +187,7 @@ pinctrl-names = "default"; }; -&pinctrl_aobus { +&gpio_ao { gpio-line-names = "UART TX", "UART RX", "VCCK En", "TF 3V3/1V8 En", "USB HUB nRESET", "USB OTG Power En", "J7 Header Pin2", "IR In", "J7 Header Pin4", @@ -197,7 +197,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",