From owner-svn-src-head@FreeBSD.ORG Mon Dec 26 07:48:30 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15732106566C; Mon, 26 Dec 2011 07:48:30 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0453C8FC08; Mon, 26 Dec 2011 07:48:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBQ7mTWH095646; Mon, 26 Dec 2011 07:48:29 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBQ7mTQP095644; Mon, 26 Dec 2011 07:48:29 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201112260748.pBQ7mTQP095644@svn.freebsd.org> From: Adrian Chadd Date: Mon, 26 Dec 2011 07:48:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228892 - head/sys/dev/ath X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 26 Dec 2011 07:48:30 -0000 Author: adrian Date: Mon Dec 26 07:48:29 2011 New Revision: 228892 URL: http://svn.freebsd.org/changeset/base/228892 Log: Since the only thing with a mux is the AR5416 and later, and we're now doing split software/hardware LED configuration, we can now simply treat "softled" as an "output" mux type. This works fine on this DWA-552. Previous generation (pre-11n NICs) don't have a GPIO mux - only input/output configuration - so they ignore this field. Modified: head/sys/dev/ath/if_ath_led.c Modified: head/sys/dev/ath/if_ath_led.c ============================================================================== --- head/sys/dev/ath/if_ath_led.c Mon Dec 26 07:47:05 2011 (r228891) +++ head/sys/dev/ath/if_ath_led.c Mon Dec 26 07:48:29 2011 (r228892) @@ -125,7 +125,7 @@ ath_led_config(struct ath_softc *sc) /* Software LED blinking - GPIO controlled LED */ if (sc->sc_softled) { ath_hal_gpioCfgOutput(sc->sc_ah, sc->sc_ledpin, - HAL_GPIO_MUX_MAC_NETWORK_LED); + HAL_GPIO_MUX_OUTPUT); ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin, !sc->sc_ledon); }