From patchwork Mon Oct 2 14:21:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9980875 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 0E30A60365 for ; Mon, 2 Oct 2017 14:22:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F400428997 for ; Mon, 2 Oct 2017 14:22:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E8282289AD; Mon, 2 Oct 2017 14:22:13 +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 6803F28997 for ; Mon, 2 Oct 2017 14:22:13 +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: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:In-Reply-To: References:List-Owner; bh=ZnKDVrGqsjna4MRdqnWSLREONWwOUpgykcGjuqjeOkc=; b=qEM 78SFG6hx8iLTLAemQSgRxkkbaCcR6w4aY2FVrp1F2uzo8a1R2EIqiwaapW8e6xLLDP0SQzoJP/v2d kkKm1K0Bpq6zBuYWNuqIxb99HGWXocRoBkztXiRX3+5Z4/5+bRBmSiCrSR8kZUACW+YC1qMG/gB56 nuuSqrPTz8Amj9XjkF82qOvD0ck6c2NXp8e4RI5zKbB6izkdhh+EbdvNT1azHSmECu46PvSFQTBus gqr+mTHE8V4kSdqmICOKGZz3wJhyrh6YKgKtLaOus0GzyB9eyDZF1tqd4nb/kJeWuy4+l4nIvkDc+ RiJd8/hj2xVfQWxB6f7m7SIXNW/URCQ==; 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 1dz1be-0001vO-Gg; Mon, 02 Oct 2017 14:22:02 +0000 Received: from mail-lf0-x22f.google.com ([2a00:1450:4010:c07::22f]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dz1bX-0001dC-Or for linux-arm-kernel@lists.infradead.org; Mon, 02 Oct 2017 14:22:00 +0000 Received: by mail-lf0-x22f.google.com with SMTP id o125so1628000lfe.0 for ; Mon, 02 Oct 2017 07:21:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=KLpNG7pxTHfZ0+UwEVz4qJs3zsOj6eoRyFYuLceSMEU=; b=L/4/o1fKvXHNk8qMz+XrPup2UQEdDfmwdiHiRAGXcC7w5AXSavDmyZeTb5VwH7IVh4 LNywmhY8ImdQqGZt7Dq5in/angNdW4Nhk8+Cw3eM3GYBofyHV04OAwpbFxw8AO4QMhRw t9AxB12TUhYulJoxWDDlbSEi+nmgVIxtZWP4o= 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; bh=KLpNG7pxTHfZ0+UwEVz4qJs3zsOj6eoRyFYuLceSMEU=; b=gh3Vq9LYKEZ2BI9nFchkMSHwtVfTf0nhqbWELOShglBH3q04yLZ6k5zSADyk3FM1mq +4TYlQgxY6/dcSNWMUGbWaXhP+miLZCMpuH5lAYUhwYABtOrG9zBMX6+eS4KQxnK9iFB nlbrIP727XzguLrtLtCoMwg1Pp5uEG5FQbiYjWUSIBDmFBZ1DjFuk7UPuTlSlGr4pwmM BQf5KKKN9d2sDmgsXHpRauZjxvDA35mRlRThxpkn3JhZkpK2y8q3lDtJQuNNZ2KAEn+c C3erKUxMQ49OuED/GXI7P42HgWPGxMOaOWchBWuYkESJ8RYX5882EALB6zeKNTdl5X09 5F4A== X-Gm-Message-State: AMCzsaV8THoQCD8bpuhmlA9RK8JZ3MIzX8al9t9miofjfGzVVOlp5QXo F7UgWQ4K+u43x6uhQR4dy2ovzDf2HXc= X-Google-Smtp-Source: AOwi7QByJfmLOWYjps28X8fv+o6E3HsAeYCmGSaxUAB9S96zxkxXTIoJQ/ltRYPJe8mSYu/R58wCWA== X-Received: by 10.25.149.130 with SMTP id x124mr3924385lfd.139.1506954093383; Mon, 02 Oct 2017 07:21:33 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id r84sm2340045ljb.82.2017.10.02.07.21.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2017 07:21:32 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Wei Xu Subject: [PATCH] arm64: dts: hisilicon: Standardize Poplar GPIO line names Date: Mon, 2 Oct 2017 16:21:29 +0200 Message-Id: <20171002142129.13102-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.13.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171002_072156_661931_7139BC1B X-CRM114-Status: UNSURE ( 9.90 ) 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: Jiancheng Xue , Peter Griffin , Linus Walleij , Alex Elder 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 hi6220-HiKey board started to name GPIO lines for 96boards, using just the plain names "GPIO-A" etc from the 96boards specification. Poplar started to use an arbitrary "LS-GPIO-A" (etc) prefix that is not part of the 96boards specification. As the former notation arrived first, and we need consistency among 96board, rectify the Poplar board to use this too. This is important for userspace that wants to look up GPIO names from these strings. Cc: Jiancheng Xue Cc: Alex Elder Cc: Peter Griffin Signed-off-by: Linus Walleij --- arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts b/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts index b9142871d6fe..a6fd13389f8d 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts @@ -78,17 +78,17 @@ &gpio1 { status = "okay"; - gpio-line-names = "LS-GPIO-E", "", + gpio-line-names = "GPIO-E", "", "", "", - "", "LS-GPIO-F", - "", "LS-GPIO-J"; + "", "GPIO-F", + "", "GPIO-J"; }; &gpio2 { status = "okay"; - gpio-line-names = "LS-GPIO-H", "LS-GPIO-I", - "LS-GPIO-L", "LS-GPIO-G", - "LS-GPIO-K", "", + gpio-line-names = "GPIO-H", "GPIO-I", + "GPIO-L", "GPIO-G", + "GPIO-K", "", "", ""; }; @@ -96,15 +96,15 @@ status = "okay"; gpio-line-names = "", "", "", "", - "LS-GPIO-C", "", - "", "LS-GPIO-B"; + "GPIO-C", "", + "", "GPIO-B"; }; &gpio4 { status = "okay"; gpio-line-names = "", "", "", "", - "", "LS-GPIO-D", + "", "GPIO-D", "", ""; }; @@ -112,7 +112,7 @@ status = "okay"; gpio-line-names = "", "USER-LED-1", "USER-LED-2", "", - "", "LS-GPIO-A", + "", "GPIO-A", "", ""; };