From owner-svn-src-head@FreeBSD.ORG Thu Apr 23 18:36:37 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 90A547D3; Thu, 23 Apr 2015 18:36:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6512512B9; Thu, 23 Apr 2015 18:36:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3NIabOW022284; Thu, 23 Apr 2015 18:36:37 GMT (envelope-from loos@FreeBSD.org) Received: (from loos@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3NIaaEk022281; Thu, 23 Apr 2015 18:36:36 GMT (envelope-from loos@FreeBSD.org) Message-Id: <201504231836.t3NIaaEk022281@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: loos set sender to loos@FreeBSD.org using -f From: Luiz Otavio O Souza Date: Thu, 23 Apr 2015 18:36:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281899 - head/sys/boot/fdt/dts/arm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2015 18:36:37 -0000 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>; }; };