From b7ce14b99c86101ece5b7a8cea2e4c3e3b92573a Mon Sep 17 00:00:00 2001
From: Luiz Otavio O Souza <loos@FreeBSD.org>
Date: Thu, 23 Apr 2015 18:36:36 +0000
Subject: [PATCH] Fix the gpio-leds node to match the LEDs on RPI2.

The 'pwr' LED is connected to GPIO pin 35 (active high) and the 'act' LED
is connected to GPIO pin 47 (active high).

Remove the GPIO pin 47 from reserved pins list, previously it was used to
signaling the SD Card presence and now it is used by act LED.
---
 sys/boot/fdt/dts/arm/bcm2836.dtsi |  6 +++---
 sys/boot/fdt/dts/arm/rpi2.dts     | 18 +++++++-----------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/sys/boot/fdt/dts/arm/bcm2836.dtsi b/sys/boot/fdt/dts/arm/bcm2836.dtsi
index ab3db509b5f..bd75c843ca4 100644
--- a/sys/boot/fdt/dts/arm/bcm2836.dtsi
+++ b/sys/boot/fdt/dts/arm/bcm2836.dtsi
@@ -131,11 +131,11 @@
 			pinctrl-names = "default";
 			pinctrl-0 = <&pins_reserved>;
 
-			/* Pins that can short 3.3V to GND in output mode: 46-47
+			/* Pins that can short 3.3V to GND in output mode: 46
 			 * Pins used by VideoCore: 48-53
 			 */
-			broadcom,read-only = <46>, <47>, <48>, <49>, <50>, 
-			                     <51>, <52>, <53>;
+			broadcom,read-only = <46>, <48>, <49>, <50>,
+					     <51>, <52>, <53>;
 
 			/* BSC0 */
 			pins_bsc0_a: bsc0_a {
diff --git a/sys/boot/fdt/dts/arm/rpi2.dts b/sys/boot/fdt/dts/arm/rpi2.dts
index 59974f148ba..1c8c559b4da 100644
--- a/sys/boot/fdt/dts/arm/rpi2.dts
+++ b/sys/boot/fdt/dts/arm/rpi2.dts
@@ -322,18 +322,14 @@
 	leds {
 		compatible = "gpio-leds";
 
-		ok {
-			label = "ok";
-			gpios = <&gpio 16 1>;
+		pwr {
+			label = "pwr";
+			gpios = <&gpio 35 0>;
+		};
 
-			/* Don't change this - it configures
-			 * how the led driver determines if
-			 * the led is on or off when it loads.
-			 */
-			default-state = "keep";
-
-			/* This is the real default state. */
-			linux,default-trigger = "default-on";
+		act {
+			label = "act";
+			gpios = <&gpio 47 0>;
 		};
 	};