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: 113901 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp2117134edb; Thu, 21 Sep 2017 10:15:11 -0700 (PDT) X-Received: by 10.98.178.204 with SMTP id z73mr6421726pfl.107.1506014111270; Thu, 21 Sep 2017 10:15:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506014111; cv=none; d=google.com; s=arc-20160816; b=g7NMwuRqe7iW4mO9A49nR4+AxtMqrlyu1H/n1BJMU9tZqHea3gS4muho4pd6gfVcM3 iu+8RVh9aDai9GTWrH2po3pqmIXZcXrHdJ8gghKMx75tqilwMG/H1qXGHW0AjLCvoa/T AzTWAJWo0EQpPY34wHUaoreh5NvJPYoTVXrZL7gfseNDwgoU6wwkg+5vrifJqpnZk6tN TuHy99xVL9aSoUuDuTENo3dK1kDaLb60xAvyg/lHgFxwqQ7MCQoxiBAKjIM80RJjcfU1 Ao0PgyECDaSABvKlRx3pjKYV6jQB8K2H6sDpEBA65EqlwdE0Wx+tsihHGnhO2xXUY0hs jIwg== 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:arc-authentication-results; bh=Fc9EjojjbOrxZY4LDtWpqXqfV96u0ASnQ2LHWnAn/5s=; b=cdI/nzjNulpIjbXjFKbCxjIrmwnNJ0slzQSszYeZ14SjM097p2t32i4GJZmjOk2FDI D8V3lYRkbYSNQBk4wqVBYLQsE+drBsv0kvQYe3/u5YJPTXMTJ0+2jHBwWO/JVUl2BUl9 2ptG3/HnjhI7DfyC7DhMUQEBZ5Fw+YqKWu1Wm8Ce3ujMNztz6KF8M66TzhDV9Tst8S7A 0IalJgX/mWgAKmP5ium/BiDshSibLsaXEUV5kkQagAcxHpFZefLeJCiVZAqdDIjIiw+s phgPA5On7SK9HJ+V0JHo/+4fKsjYJcSV2UKW53j3EkbJ7b0uIBeuaXBFPdvOs9YOj1Ry 61Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=vkERUcfj; 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 k3si1350783plt.237.2017.09.21.10.15.10; Thu, 21 Sep 2017 10:15:11 -0700 (PDT) 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=vkERUcfj; 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 S1753312AbdIURPI (ORCPT + 26 others); Thu, 21 Sep 2017 13:15:08 -0400 Received: from mail-wr0-f170.google.com ([209.85.128.170]:53497 "EHLO mail-wr0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753291AbdIURPE (ORCPT ); Thu, 21 Sep 2017 13:15:04 -0400 Received: by mail-wr0-f170.google.com with SMTP id l22so5150946wrc.10 for ; Thu, 21 Sep 2017 10:15:03 -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=JUm54jSqQKHBvhJ5Ythl+sSEm+7dxBucJs2qOwTO1lz00pL4l/PnmgHXOigZBIeBbZ JImaRVL/OtFn0fW+tVzdGvE1cDwbLh9W9F7+qPWqqqdwKLk7356rW99WzG9mc3zr8g1j sk9e5hlJKBMOxjadimkLbrivs8TWrikPJeFYu8i1Cu+mvM/FvMhSZhGwfiwxxEiD0MkY nkTAgZqOdb2kadCUT6zdL9d0TGtp8M4s3a3P7C6o5mDOuYe/d5zrHbJJ1Rf7ewNilxFH pMYPTvcuXT6I/gbTne11A4knIMXY7tjNeQtjL90W8bTe7tUPN4tKOfjAS2SsXSMMxLo+ kMrg== X-Gm-Message-State: AHPjjUiTQHl1Q+6cB+8RozDZ0+Qym1sUeOAmh7wYJrnT6AY2LRHFECV8 NTx6CUl+CvO0daHaHRzhPM8esw== 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 Cc: Jerome Brunet , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Martin Blumenstingl 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.13.5 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 {