Commit 17d50d1d authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k: Move btcoex stuff from hw.[ch] to new btcoex.[ch] 



Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f985ad12

drivers/net/wireless/ath/ath9k/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ ath9k-y += hw.o \ 
		recv.o \

		xmit.o \

		virtual.o \

		rc.o

		rc.o \

		btcoex.o



ath9k-$(CONFIG_PCI) += pci.o

ath9k-$(CONFIG_ATHEROS_AR71XX) += ahb.o

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

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "rc.h"

#include "debug.h"

#include "../ath.h"

#include "btcoex.h"



struct ath_node;

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

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2009 Atheros Communications Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#include "ath9k.h"



void ath9k_hw_btcoex_init(struct ath_hw *ah)

{

	/* connect bt_active to baseband */

	REG_CLR_BIT(ah, AR_GPIO_INPUT_EN_VAL,

			(AR_GPIO_INPUT_EN_VAL_BT_PRIORITY_DEF |

			 AR_GPIO_INPUT_EN_VAL_BT_FREQUENCY_DEF));



	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL,

			AR_GPIO_INPUT_EN_VAL_BT_ACTIVE_BB);



	/* Set input mux for bt_active to gpio pin */

	REG_RMW_FIELD(ah, AR_GPIO_INPUT_MUX1,

			AR_GPIO_INPUT_MUX1_BT_ACTIVE,

			ah->btactive_gpio);



	/* Configure the desired gpio port for input */

	ath9k_hw_cfg_gpio_input(ah, ah->btactive_gpio);

}



void ath9k_hw_btcoex_enable(struct ath_hw *ah)

{

	/* Configure the desired GPIO port for TX_FRAME output */

	ath9k_hw_cfg_output(ah, ah->wlanactive_gpio,

			    AR_GPIO_OUTPUT_MUX_AS_TX_FRAME);



	ah->ah_sc->sc_flags |= SC_OP_BTCOEX_ENABLED;

}



void ath9k_hw_btcoex_disable(struct ath_hw *ah)

{

	ath9k_hw_set_gpio(ah, ah->wlanactive_gpio, 0);



	ath9k_hw_cfg_output(ah, ah->wlanactive_gpio,

			AR_GPIO_OUTPUT_MUX_AS_OUTPUT);



	ah->ah_sc->sc_flags &= ~SC_OP_BTCOEX_ENABLED;

}

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

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2009 Atheros Communications Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */



#ifndef BTCOEX_H

#define BTCOEX_H



void ath9k_hw_btcoex_init(struct ath_hw *ah);

void ath9k_hw_btcoex_enable(struct ath_hw *ah);

void ath9k_hw_btcoex_disable(struct ath_hw *ah);



#endif

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

+0 −42
Original line number Diff line number Diff line
@@ -4068,45 +4068,3 @@ void ath9k_hw_set11nmac2040(struct ath_hw *ah, enum ath9k_ht_macmode mode) 


	REG_WRITE(ah, AR_2040_MODE, macmode);

}
 


/***************************/

/*  Bluetooth Coexistence  */

/***************************/



void ath9k_hw_btcoex_init(struct ath_hw *ah)

{

	/* connect bt_active to baseband */

	REG_CLR_BIT(ah, AR_GPIO_INPUT_EN_VAL,

			(AR_GPIO_INPUT_EN_VAL_BT_PRIORITY_DEF |

			 AR_GPIO_INPUT_EN_VAL_BT_FREQUENCY_DEF));



	REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL,

			AR_GPIO_INPUT_EN_VAL_BT_ACTIVE_BB);



	/* Set input mux for bt_active to gpio pin */

	REG_RMW_FIELD(ah, AR_GPIO_INPUT_MUX1,

			AR_GPIO_INPUT_MUX1_BT_ACTIVE,

			ah->btactive_gpio);



	/* Configure the desired gpio port for input */

	ath9k_hw_cfg_gpio_input(ah, ah->btactive_gpio);

}



void ath9k_hw_btcoex_enable(struct ath_hw *ah)

{

	/* Configure the desired GPIO port for TX_FRAME output */

	ath9k_hw_cfg_output(ah, ah->wlanactive_gpio,

			    AR_GPIO_OUTPUT_MUX_AS_TX_FRAME);



	ah->ah_sc->sc_flags |= SC_OP_BTCOEX_ENABLED;

}



void ath9k_hw_btcoex_disable(struct ath_hw *ah)

{

	ath9k_hw_set_gpio(ah, ah->wlanactive_gpio, 0);



	ath9k_hw_cfg_output(ah, ah->wlanactive_gpio,

			AR_GPIO_OUTPUT_MUX_AS_OUTPUT);



	ah->ah_sc->sc_flags &= ~SC_OP_BTCOEX_ENABLED;

}