Return-path: Received: from aserp1040.oracle.com ([141.146.126.69]:50057 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161190AbcFCVh4 (ORCPT ); Fri, 3 Jun 2016 17:37:56 -0400 From: Sasha Levin To: stable@vger.kernel.org, stable-commits@vger.kernel.org Cc: "Vittorio Gambaletta (VittGam)" , , , , Vittorio Gambaletta , Kalle Valo , Sasha Levin Subject: [added to the 4.1 stable tree] ath9k: Add a module parameter to invert LED polarity. Date: Fri, 3 Jun 2016 17:35:23 -0400 Message-Id: <1464989831-16666-28-git-send-email-sasha.levin@oracle.com> (sfid-20160603_233808_072768_881382B9) In-Reply-To: <1464989831-16666-1-git-send-email-sasha.levin@oracle.com> References: <1464989831-16666-1-git-send-email-sasha.levin@oracle.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: From: "Vittorio Gambaletta (VittGam)" This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. =============== [ Upstream commit cd84042ce9040ad038e958bc67a46fcfc015c736 ] The LED can be active high instead of active low on some hardware. Add the led_active_high module parameter. It defaults to -1 to obey platform data as before. Setting the parameter to 1 or 0 will force the LED respectively active high or active low. Cc: Cc: Cc: Cc: Signed-off-by: Vittorio Gambaletta Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath9k/init.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 46a389c..b7b0254 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -49,6 +49,10 @@ int ath9k_led_blink; module_param_named(blink, ath9k_led_blink, int, 0444); MODULE_PARM_DESC(blink, "Enable LED blink on activity"); +static int ath9k_led_active_high = -1; +module_param_named(led_active_high, ath9k_led_active_high, int, 0444); +MODULE_PARM_DESC(led_active_high, "Invert LED polarity"); + static int ath9k_btcoex_enable; module_param_named(btcoex_enable, ath9k_btcoex_enable, int, 0444); MODULE_PARM_DESC(btcoex_enable, "Enable wifi-BT coexistence"); @@ -600,6 +604,9 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, if (ret) return ret; + if (ath9k_led_active_high != -1) + ah->config.led_active_high = ath9k_led_active_high == 1; + /* * Enable WLAN/BT RX Antenna diversity only when: * -- 2.5.0