From patchwork Thu Sep 21 17:14:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9964545 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CB227600C5 for ; Thu, 21 Sep 2017 17:16:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B19E028662 for ; Thu, 21 Sep 2017 17:16:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A60B828918; Thu, 21 Sep 2017 17:16:56 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 5D66F28662 for ; Thu, 21 Sep 2017 17:16:56 +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=Ad7raQN8cMyNEeCCQNcn1VkTJoFpdSGtBgvRbFrn/4U=; b=pwZvBjQnmeiGfSwG2Jj4hzm/dh iQMo15KsA2SPJ8oKKwvnM+nsIhB3plcBPAcaxp6j6QnA81raeTu15zbwdUDvnSoOrbl9/6AfT1Knv bCbgPdqvVE0ZopX24xb5kgKGXNbEJ+kfVVRI4TRqwPBNqFCOuXZB+2nlQCpGbWSs7gMvlWl1a20DN 0unVo0pqjBPx6bgHKS3gOZwKwf2DgQy2tB0Rj+aUg3sL7XA8+yyyxp9THSpe9SwKPEr2kupLZdJWf d0uyPeNSNb14ysXlXqd+jNA5xrBMv9I5HWkCwES+CoelsHVNs34Ks42zHxcoviM2u6dXmAKQYKZuW mB4dvvTg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dv55i-0007OE-Os; Thu, 21 Sep 2017 17:16:46 +0000 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dv54O-0005B8-HP for linux-arm-kernel@lists.infradead.org; Thu, 21 Sep 2017 17:15:28 +0000 Received: by mail-wr0-x22a.google.com with SMTP id r74so5095860wrb.13 for ; Thu, 21 Sep 2017 10:15:04 -0700 (PDT) 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=Fc9EjojjbOrxZY4LDtWpqXqfV96u0ASnQ2LHWnAn/5s=; b=vkERUcfj+5WBVT7wwD0eUdKhLNf7VI04pKrSBkwvQEgmYSkjKacwreBdAdpr3IOWWG wmcoYTj6iePEF+DFaXDHu5DWW43w6iWTnqvWqe3FBAwD9vBlbbNkhQo+9hpDsjmCUX8P +/b/lCGI43V2fLmEQ92ZJ+0pGdSxBvK+0mVkIpY+mSjRdChg8JERqbXw7U6AoUBdxIJc sKvGVdXH9iM4F/SpKt3pMj0ij4j0nEiD2PhguhYZLky3aLHt4G1ll2erLHRSYP4ofYyR Cl9xCjSCGfB2T4193lc0LsgI1TijOVZisUHM8BE5/fsaZ5pwLOEcey14Qwgi3kSt54cq xxmw== 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=Fc9EjojjbOrxZY4LDtWpqXqfV96u0ASnQ2LHWnAn/5s=; b=sZe4toHn+mtTRVsOlRfQO1u2SE1n5AjL7cEh2kKeo1E/ajsbE8LiWNRQJwd3yeAbWf YPjIV8L4Q4Si4pvZJ2cRzowx9ikSb0w/lH7oCJRrnqMlYnRL1fZ5OyuL1DfOL1Vz3NWZ GxVd9fygE6RsDm08sPjuZnb3ODcn3UcBi12bza2wzVloIvan3CREU7pQlOTFyin8X0AP mh37N/9mtm2nRQeDfDjmPlpZJLvKYxuu2cy8eNH/jluCeho7UBuqXvub7vLbUk75NtWn UnLctWcQaOvrQMKFIxxpT/U57fgnhr3XgOrmCw4ZRYVapRkrTnGHXRTA1QDJCb9KTC1k n2MA== X-Gm-Message-State: AHPjjUhyeCFdFfHsZoJ7kKH9wdXnd/wiz6C3EhVz7fR1OvXMX4CN0uNf FeL7oodZOqgPP415lFKUjd7Q6A== X-Google-Smtp-Source: AOwi7QDoWPL6JQ/0WZbQ27fH5V6xDyx0Ec4FXgvFvLJn1vOf+AoMz4dG8DqDFjkKzVIshf4sgp0ijg== X-Received: by 10.223.177.139 with SMTP id q11mr2783287wra.269.1506014102741; Thu, 21 Sep 2017 10:15:02 -0700 (PDT) Received: from localhost.localdomain (cag06-3-82-243-161-21.fbx.proxad.net. [82.243.161.21]) by smtp.googlemail.com with ESMTPSA id d9sm2789029wrd.37.2017.09.21.10.15.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Sep 2017 10:15:02 -0700 (PDT) From: Jerome Brunet To: Kevin Hilman , Carlo Caione Subject: [PATCH 4/7] ARM64: dts: meson-gxbb: adjust nanopi-k2 gpio-line-names Date: Thu, 21 Sep 2017 19:14:47 +0200 Message-Id: <20170921171450.27407-5-jbrunet@baylibre.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170921171450.27407-1-jbrunet@baylibre.com> References: <20170921171450.27407-1-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170921_101525_215304_6F244992 X-CRM114-Status: UNSURE ( 8.22 ) X-CRM114-Notice: Please train this message. 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: devicetree@vger.kernel.org, Martin Blumenstingl , linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet 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 GPIOX22 is now declared properly and TEST_N has been moved so the gpio-line-names of the nanopi-k2 must be adjusted accordingly Signed-off-by: Jerome Brunet --- arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 9697a7a79464..3c445030ed52 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts @@ -180,7 +180,9 @@ "VCCK En", "CON1 Header Pin31", "I2S Header Pin6", "IR In", "I2S Header Pin7", "I2S Header Pin3", "I2S Header Pin4", - "I2S Header Pin5", "HDMI CEC", "SYS LED"; + "I2S Header Pin5", "HDMI CEC", "SYS LED", + /* GPIO_TEST_N */ + ""; }; &pinctrl_periphs { @@ -226,11 +228,9 @@ "Bluetooth UART TX", "Bluetooth UART RX", "Bluetooth UART CTS", "Bluetooth UART RTS", "", "", "", "WIFI 32K", "Bluetooth Enable", - "Bluetooth WAKE HOST", + "Bluetooth WAKE HOST", "", /* Bank GPIOCLK */ - "", "CON1 Header Pin35", "", "", - /* GPIO_TEST_N */ - ""; + "", "CON1 Header Pin35", "", ""; }; &pwm_ef {