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

Commit b2d70d49 authored by Miaoqing Pan's avatar Miaoqing Pan Committed by Kalle Valo
Browse files

ath9k: make GPIO API to support both of WMAC and SOC 



commit 61b559de ("ath9k: add extra GPIO led support")
added ath9k to support access SOC's GPIOs, but implemented
in a separated API: ath9k_hw_request_gpio().

So this patch make the APIs more common, to support both
of WMAC and SOC GPIOs. The new APIs as below,

void ath9k_hw_gpio_request_in();
void ath9k_hw_gpio_request_out();
void ath9k_hw_gpio_free();

NOTE, the BSP of the SOC chips(AR9340, AR9531, AR9550, AR9561)
should set the corresponding MUX registers correctly.

Signed-off-by: default avatarMiaoqing Pan <miaoqing@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent a01ab81b

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

+2 −2
Original line number Diff line number Diff line
@@ -3590,7 +3590,7 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz) 
		else

			gpio = AR9300_EXT_LNA_CTL_GPIO_AR9485;



		ath9k_hw_cfg_output(ah, gpio,

		ath9k_hw_gpio_request_out(ah, gpio, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED);

	}

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

+26 −13
Original line number Diff line number Diff line
@@ -427,21 +427,34 @@ static void ar9003_mci_observation_set_up(struct ath_hw *ah) 
	struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;



	if (mci->config & ATH_MCI_CONFIG_MCI_OBS_MCI) {

		ath9k_hw_cfg_output(ah, 3, AR_GPIO_OUTPUT_MUX_AS_MCI_WLAN_DATA);

		ath9k_hw_cfg_output(ah, 2, AR_GPIO_OUTPUT_MUX_AS_MCI_WLAN_CLK);

		ath9k_hw_cfg_output(ah, 1, AR_GPIO_OUTPUT_MUX_AS_MCI_BT_DATA);

		ath9k_hw_cfg_output(ah, 0, AR_GPIO_OUTPUT_MUX_AS_MCI_BT_CLK);

		ath9k_hw_gpio_request_out(ah, 3, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_MCI_WLAN_DATA);

		ath9k_hw_gpio_request_out(ah, 2, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_MCI_WLAN_CLK);

		ath9k_hw_gpio_request_out(ah, 1, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_MCI_BT_DATA);

		ath9k_hw_gpio_request_out(ah, 0, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_MCI_BT_CLK);

	} else if (mci->config & ATH_MCI_CONFIG_MCI_OBS_TXRX) {

		ath9k_hw_cfg_output(ah, 3, AR_GPIO_OUTPUT_MUX_AS_WL_IN_TX);

		ath9k_hw_cfg_output(ah, 2, AR_GPIO_OUTPUT_MUX_AS_WL_IN_RX);

		ath9k_hw_cfg_output(ah, 1, AR_GPIO_OUTPUT_MUX_AS_BT_IN_TX);

		ath9k_hw_cfg_output(ah, 0, AR_GPIO_OUTPUT_MUX_AS_BT_IN_RX);

		ath9k_hw_cfg_output(ah, 5, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);

		ath9k_hw_gpio_request_out(ah, 3, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_WL_IN_TX);

		ath9k_hw_gpio_request_out(ah, 2, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_WL_IN_RX);

		ath9k_hw_gpio_request_out(ah, 1, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_BT_IN_TX);

		ath9k_hw_gpio_request_out(ah, 0, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_BT_IN_RX);

		ath9k_hw_gpio_request_out(ah, 5, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_OUTPUT);

	} else if (mci->config & ATH_MCI_CONFIG_MCI_OBS_BT) {

		ath9k_hw_cfg_output(ah, 3, AR_GPIO_OUTPUT_MUX_AS_BT_IN_TX);

		ath9k_hw_cfg_output(ah, 2, AR_GPIO_OUTPUT_MUX_AS_BT_IN_RX);

		ath9k_hw_cfg_output(ah, 1, AR_GPIO_OUTPUT_MUX_AS_MCI_BT_DATA);

		ath9k_hw_cfg_output(ah, 0, AR_GPIO_OUTPUT_MUX_AS_MCI_BT_CLK);

		ath9k_hw_gpio_request_out(ah, 3, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_BT_IN_TX);

		ath9k_hw_gpio_request_out(ah, 2, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_BT_IN_RX);

		ath9k_hw_gpio_request_out(ah, 1, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_MCI_BT_DATA);

		ath9k_hw_gpio_request_out(ah, 0, NULL,

					  AR_GPIO_OUTPUT_MUX_AS_MCI_BT_CLK);

	} else

		return;

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

+14 −13
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah) 
		      btcoex_hw->btactive_gpio);



	/* Configure the desired gpio port for input */

	ath9k_hw_cfg_gpio_input(ah, btcoex_hw->btactive_gpio);

	ath9k_hw_gpio_request_in(ah, btcoex_hw->btactive_gpio,

				 "ath9k-btactive");

}

EXPORT_SYMBOL(ath9k_hw_btcoex_init_2wire);
@@ -166,9 +167,10 @@ void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah) 
			btcoex_hw->btpriority_gpio);



	/* Configure the desired GPIO ports for input */



	ath9k_hw_cfg_gpio_input(ah, btcoex_hw->btactive_gpio);

	ath9k_hw_cfg_gpio_input(ah, btcoex_hw->btpriority_gpio);

	ath9k_hw_gpio_request_in(ah, btcoex_hw->btactive_gpio,

				 "ath9k-btactive");

	ath9k_hw_gpio_request_in(ah, btcoex_hw->btpriority_gpio,

				 "ath9k-btpriority");

}

EXPORT_SYMBOL(ath9k_hw_btcoex_init_3wire);
@@ -201,7 +203,8 @@ static void ath9k_hw_btcoex_enable_2wire(struct ath_hw *ah) 
	struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;



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

	ath9k_hw_cfg_output(ah, btcoex_hw->wlanactive_gpio,

	ath9k_hw_gpio_request_out(ah, btcoex_hw->wlanactive_gpio,

				  "ath9k-wlanactive",

				  AR_GPIO_OUTPUT_MUX_AS_TX_FRAME);

}
@@ -271,7 +274,6 @@ static void ath9k_hw_btcoex_enable_3wire(struct ath_hw *ah) 
	REG_WRITE(ah, AR_BT_COEX_MODE, btcoex->bt_coex_mode);

	REG_WRITE(ah, AR_BT_COEX_MODE2, btcoex->bt_coex_mode2);





	if (AR_SREV_9300_20_OR_LATER(ah)) {

		REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS0, btcoex->wlan_weight[0]);

		REG_WRITE(ah, AR_BT_COEX_WL_WEIGHTS1, btcoex->wlan_weight[1]);
@@ -281,8 +283,6 @@ static void ath9k_hw_btcoex_enable_3wire(struct ath_hw *ah) 
	} else

		REG_WRITE(ah, AR_BT_COEX_WEIGHT, btcoex->bt_coex_weights);







	if (AR_SREV_9271(ah)) {

		val = REG_READ(ah, 0x50040);

		val &= 0xFFFFFEFF;
@@ -292,7 +292,8 @@ static void ath9k_hw_btcoex_enable_3wire(struct ath_hw *ah) 
	REG_RMW_FIELD(ah, AR_QUIET1, AR_QUIET1_QUIET_ACK_CTS_ENABLE, 1);

	REG_RMW_FIELD(ah, AR_PCU_MISC, AR_PCU_BT_ANT_PREVENT_RX, 0);



	ath9k_hw_cfg_output(ah, btcoex->wlanactive_gpio,

	ath9k_hw_gpio_request_out(ah, btcoex->wlanactive_gpio,

				  "ath9k-wlanactive",

				  AR_GPIO_OUTPUT_MUX_AS_RX_CLEAR_EXTERNAL);

}
@@ -364,8 +365,8 @@ void ath9k_hw_btcoex_disable(struct ath_hw *ah) 
	if (!AR_SREV_9300_20_OR_LATER(ah))

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



	ath9k_hw_cfg_output(ah, btcoex_hw->wlanactive_gpio,

			AR_GPIO_OUTPUT_MUX_AS_OUTPUT);

	ath9k_hw_gpio_request_out(ah, btcoex_hw->wlanactive_gpio,

				  NULL, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);



	if (btcoex_hw->scheme == ATH_BTCOEX_CFG_3WIRE) {

		REG_WRITE(ah, AR_BT_COEX_MODE, AR_BT_QUIET | AR_BT_MODE);

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

+4 −2
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ void ath_fill_led_pin(struct ath_softc *sc) 


	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");

			ath9k_hw_gpio_request_out(ah, ah->led_pin, "ath9k-led",

						  AR_GPIO_OUTPUT_MUX_AS_OUTPUT);

		return;

	}
@@ -90,7 +91,8 @@ void ath_fill_led_pin(struct ath_softc *sc) 
		ah->led_pin = ATH_LED_PIN_DEF;



	/* Configure gpio 1 for output */

	ath9k_hw_cfg_output(ah, ah->led_pin, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);

	ath9k_hw_gpio_request_out(ah, ah->led_pin, "ath9k-led",

				  AR_GPIO_OUTPUT_MUX_AS_OUTPUT);



	/* LED off, active low */

	ath9k_hw_set_gpio(ah, ah->led_pin, (ah->config.led_active_high) ? 0 : 1);

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

+3 −3
Original line number Diff line number Diff line
@@ -259,11 +259,11 @@ void ath9k_deinit_leds(struct ath9k_htc_priv *priv) 
void ath9k_configure_leds(struct ath9k_htc_priv *priv)

{

	/* Configure gpio 1 for output */

	ath9k_hw_cfg_output(priv->ah, priv->ah->led_pin,

	ath9k_hw_gpio_request_out(priv->ah, priv->ah->led_pin,

				  "ath9k-led",

				  AR_GPIO_OUTPUT_MUX_AS_OUTPUT);

	/* LED off, active low */

	ath9k_hw_set_gpio(priv->ah, priv->ah->led_pin, 1);



}



void ath9k_init_leds(struct ath9k_htc_priv *priv)