svn commit: r281899 - head/sys/boot/fdt/dts/arm

[Luiz Otavio O Souza]

Author: loos
Date: Thu Apr 23 18:36:36 2015
New Revision: 281899
URL: https://svnweb.freebsd.org/changeset/base/281899

Log:
  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.

Modified:
  head/sys/boot/fdt/dts/arm/bcm2836.dtsi
  head/sys/boot/fdt/dts/arm/rpi2.dts

Modified: head/sys/boot/fdt/dts/arm/bcm2836.dtsi
==============================================================================
--- head/sys/boot/fdt/dts/arm/bcm2836.dtsi	Thu Apr 23 15:26:07 2015	(r281898)
+++ head/sys/boot/fdt/dts/arm/bcm2836.dtsi	Thu Apr 23 18:36:36 2015	(r281899)
@@ -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 {

Modified: head/sys/boot/fdt/dts/arm/rpi2.dts
==============================================================================
--- head/sys/boot/fdt/dts/arm/rpi2.dts	Thu Apr 23 15:26:07 2015	(r281898)
+++ head/sys/boot/fdt/dts/arm/rpi2.dts	Thu Apr 23 18:36:36 2015	(r281899)
@@ -322,18 +322,14 @@
 	leds {
 		compatible = "gpio-leds";
 
-		ok {
-			label = "ok";
-			gpios = <&gpio 16 1>;
-
-			/* Don't change this - it configures
-			 * how the led driver determines if
-			 * the led is on or off when it loads.
-			 */
-			default-state = "keep";
+		pwr {
+			label = "pwr";
+			gpios = <&gpio 35 0>;
+		};
 
-			/* This is the real default state. */
-			linux,default-trigger = "default-on";
+		act {
+			label = "act";
+			gpios = <&gpio 47 0>;
 		};
 	};