From patchwork Wed Jun 8 07:36:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 9163541 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 20A6C60467 for ; Wed, 8 Jun 2016 07:38:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11FEB28348 for ; Wed, 8 Jun 2016 07:38:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06D352838D; Wed, 8 Jun 2016 07:38:17 +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, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A002128348 for ; Wed, 8 Jun 2016 07:38:16 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAY2p-0000ku-9V; Wed, 08 Jun 2016 07:36:55 +0000 Received: from mirror2.csie.ntu.edu.tw ([140.112.30.76] helo=wens.csie.org) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAY2m-0000Ps-EU for linux-arm-kernel@lists.infradead.org; Wed, 08 Jun 2016 07:36:53 +0000 Received: by wens.csie.org (Postfix, from userid 1000) id 0DDCB5F7F0; Wed, 8 Jun 2016 15:36:27 +0800 (CST) From: Chen-Yu Tsai To: Maxime Ripard Subject: [PATCH] ARM: dts: sun8i-h3: sinovoip-bpi-m2-plus: Fix LED and switch labels Date: Wed, 8 Jun 2016 15:36:26 +0800 Message-Id: <1465371386-14479-1-git-send-email-wens@csie.org> X-Mailer: git-send-email 2.8.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160608_003652_655563_AB587FD8 X-CRM114-Status: UNSURE ( 8.95 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chen-Yu Tsai , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 switch is clearly labeled "power" on the board. The LED is red, and is lit by default through an external pull up. Label it as "pwr" even though there is no explicit marking. Signed-off-by: Chen-Yu Tsai --- Hi Maxime, This patch fixes 2 copy paste errors in the bpi-m2+ dts that slipped through. Can you squash it into my original patch? Thanks ChenYu --- arch/arm/boot/dts/sun8i-h3-sinovoip-bpi-m2-plus.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-h3-sinovoip-bpi-m2-plus.dts b/arch/arm/boot/dts/sun8i-h3-sinovoip-bpi-m2-plus.dts index 8a19b4b44f1f..8387c458d615 100644 --- a/arch/arm/boot/dts/sun8i-h3-sinovoip-bpi-m2-plus.dts +++ b/arch/arm/boot/dts/sun8i-h3-sinovoip-bpi-m2-plus.dts @@ -67,7 +67,7 @@ pinctrl-0 = <&pwr_led_bpi_m2p>; pwr_led { - label = "orangepi:green:pwr"; + label = "bpi-m2+:red:pwr"; gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ default-state = "on"; }; @@ -79,7 +79,7 @@ pinctrl-0 = <&sw_r_bpi_m2p>; sw4 { - label = "sw4"; + label = "power"; linux,code = ; gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; };