linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: dts: sun8i-h3: sinovoip-bpi-m2-plus: Fix LED and switch labels
@ 2016-06-08  7:36 Chen-Yu Tsai
  2016-06-09 18:51 ` Maxime Ripard
  0 siblings, 1 reply; 2+ messages in thread
From: Chen-Yu Tsai @ 2016-06-08  7:36 UTC (permalink / raw)
  To: Maxime Ripard; +Cc: Chen-Yu Tsai, linux-arm-kernel, linux-kernel

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 <wens@csie.org>
---

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 = <BTN_0>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
 		};
-- 
2.8.1

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] ARM: dts: sun8i-h3: sinovoip-bpi-m2-plus: Fix LED and switch labels
  2016-06-08  7:36 [PATCH] ARM: dts: sun8i-h3: sinovoip-bpi-m2-plus: Fix LED and switch labels Chen-Yu Tsai
@ 2016-06-09 18:51 ` Maxime Ripard
  0 siblings, 0 replies; 2+ messages in thread
From: Maxime Ripard @ 2016-06-09 18:51 UTC (permalink / raw)
  To: Chen-Yu Tsai; +Cc: linux-arm-kernel, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

On Wed, Jun 08, 2016 at 03:36:26PM +0800, Chen-Yu Tsai wrote:
> 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 <wens@csie.org>
> ---
> 
> 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?

Done, thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-06-09 18:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-08  7:36 [PATCH] ARM: dts: sun8i-h3: sinovoip-bpi-m2-plus: Fix LED and switch labels Chen-Yu Tsai
2016-06-09 18:51 ` Maxime Ripard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).