Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ab1a30f authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-for-davem-2015-04-09' of... 

Merge tag 'wireless-drivers-next-for-davem-2015-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
Major changes:

iwlwifi:

* some more work on LAR
* fixes for UMAC scan
* more work on debugging framework
* more work for 8000 devices
* cleanups and small bugfixes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9399bdcb f56d9e23

drivers/net/wireless/ath/ath9k/gpio.c

+7 −1
Original line number Diff line number Diff line
@@ -69,9 +69,15 @@ void ath_fill_led_pin(struct ath_softc *sc) 
{

	struct ath_hw *ah = sc->sc_ah;



	if (AR_SREV_9100(ah) || (ah->led_pin >= 0))

	if (AR_SREV_9100(ah))

		return;



	if (ah->led_pin >= 0) {

		if (!((1 << ah->led_pin) & AR_GPIO_OE_OUT_MASK))

			ath9k_hw_request_gpio(ah, ah->led_pin, "ath9k-led");

		return;

	}



	if (AR_SREV_9287(ah))

		ah->led_pin = ATH_LED_PIN_9287;

	else if (AR_SREV_9485(sc->sc_ah))

drivers/net/wireless/ath/ath9k/hw.c

+15 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/time.h>

#include <linux/bitops.h>

#include <linux/etherdevice.h>

#include <linux/gpio.h>

#include <asm/unaligned.h>



#include "hw.h"
@@ -2711,11 +2712,23 @@ void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val) 
	if (AR_SREV_9271(ah))

		val = ~val;



	if ((1 << gpio) & AR_GPIO_OE_OUT_MASK)

		REG_RMW(ah, AR_GPIO_IN_OUT, ((val & 1) << gpio),

			AR_GPIO_BIT(gpio));

	else

		gpio_set_value(gpio, val & 1);

}

EXPORT_SYMBOL(ath9k_hw_set_gpio);



void ath9k_hw_request_gpio(struct ath_hw *ah, u32 gpio, const char *label)

{

	if (gpio >= ah->caps.num_gpio_pins)

		return;



	gpio_request_one(gpio, GPIOF_DIR_OUT | GPIOF_INIT_LOW, label);

}

EXPORT_SYMBOL(ath9k_hw_request_gpio);



void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna)

{

	REG_WRITE(ah, AR_DEF_ANTENNA, (antenna & 0x7));

drivers/net/wireless/ath/ath9k/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,7 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio); 
void ath9k_hw_cfg_output(struct ath_hw *ah, u32 gpio,

			 u32 ah_signal_type);

void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val);

void ath9k_hw_request_gpio(struct ath_hw *ah, u32 gpio, const char *label);

void ath9k_hw_setantenna(struct ath_hw *ah, u32 antenna);



/* General Operation */

drivers/net/wireless/ath/ath9k/reg.h

+4 −0
Original line number Diff line number Diff line
@@ -958,6 +958,8 @@ 


#define AR_SREV_9550(_ah) \

	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_9550))

#define AR_SREV_9550_OR_LATER(_ah) \

	(((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9550))



#define AR_SREV_9580(_ah) \

	(((_ah)->hw_version.macVersion == AR_SREV_VERSION_9580) && \
@@ -1128,6 +1130,8 @@ enum { 


#define AR_GPIO_OE_OUT                           (AR_SREV_9340(ah) ? 0x4030 : \

						  (AR_SREV_9300_20_OR_LATER(ah) ? 0x4050 : 0x404c))

#define AR_GPIO_OE_OUT_MASK			 (AR_SREV_9550_OR_LATER(ah) ? \

						  0x0000000F : 0xFFFFFFFF)

#define AR_GPIO_OE_OUT_DRV                       0x3

#define AR_GPIO_OE_OUT_DRV_NO                    0x0

#define AR_GPIO_OE_OUT_DRV_LOW                   0x1

drivers/net/wireless/ath/ath9k/wmi.c

+6 −6
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb, 


	/* Check if there has been a timeout. */

	spin_lock(&wmi->wmi_lock);

	if (cmd_id != wmi->last_cmd_id) {

	if (be16_to_cpu(hdr->seq_no) != wmi->last_seq_id) {

		spin_unlock(&wmi->wmi_lock);

		goto free_skb;

	}
@@ -275,11 +275,16 @@ static int ath9k_wmi_cmd_issue(struct wmi *wmi, 
			       enum wmi_cmd_id cmd, u16 len)

{

	struct wmi_cmd_hdr *hdr;

	unsigned long flags;



	hdr = (struct wmi_cmd_hdr *) skb_push(skb, sizeof(struct wmi_cmd_hdr));

	hdr->command_id = cpu_to_be16(cmd);

	hdr->seq_no = cpu_to_be16(++wmi->tx_seq_id);



	spin_lock_irqsave(&wmi->wmi_lock, flags);

	wmi->last_seq_id = wmi->tx_seq_id;

	spin_unlock_irqrestore(&wmi->wmi_lock, flags);



	return htc_send_epid(wmi->htc, skb, wmi->ctrl_epid);

}
@@ -295,7 +300,6 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id, 
	struct sk_buff *skb;

	u8 *data;

	int time_left, ret = 0;

	unsigned long flags;



	if (ah->ah_flags & AH_UNPLUGGED)

		return 0;
@@ -323,10 +327,6 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id, 
	wmi->cmd_rsp_buf = rsp_buf;

	wmi->cmd_rsp_len = rsp_len;



	spin_lock_irqsave(&wmi->wmi_lock, flags);

	wmi->last_cmd_id = cmd_id;

	spin_unlock_irqrestore(&wmi->wmi_lock, flags);



	ret = ath9k_wmi_cmd_issue(wmi, skb, cmd_id, cmd_len);

	if (ret)

		goto out;