Commit db222190 authored by Miaoqing Pan's avatar Miaoqing Pan Committed by Kalle Valo

ath9k: free GPIO resource for SOC GPIOs

For SOC GPIOs, should call ath9k_hw_gpio_free() to release
the GPIO resource.
Signed-off-by: default avatarMiaoqing Pan <miaoqing@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent b2d70d49
...@@ -174,6 +174,16 @@ void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah) ...@@ -174,6 +174,16 @@ void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah)
} }
EXPORT_SYMBOL(ath9k_hw_btcoex_init_3wire); EXPORT_SYMBOL(ath9k_hw_btcoex_init_3wire);
void ath9k_hw_btcoex_deinit(struct ath_hw *ah)
{
struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;
ath9k_hw_gpio_free(ah, btcoex_hw->btactive_gpio);
ath9k_hw_gpio_free(ah, btcoex_hw->btpriority_gpio);
ath9k_hw_gpio_free(ah, btcoex_hw->wlanactive_gpio);
}
EXPORT_SYMBOL(ath9k_hw_btcoex_deinit);
void ath9k_hw_btcoex_init_mci(struct ath_hw *ah) void ath9k_hw_btcoex_init_mci(struct ath_hw *ah)
{ {
ah->btcoex_hw.mci.ready = false; ah->btcoex_hw.mci.ready = false;
......
...@@ -123,6 +123,7 @@ struct ath_btcoex_hw { ...@@ -123,6 +123,7 @@ struct ath_btcoex_hw {
void ath9k_hw_btcoex_init_scheme(struct ath_hw *ah); void ath9k_hw_btcoex_init_scheme(struct ath_hw *ah);
void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah); void ath9k_hw_btcoex_init_2wire(struct ath_hw *ah);
void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah); void ath9k_hw_btcoex_init_3wire(struct ath_hw *ah);
void ath9k_hw_btcoex_deinit(struct ath_hw *ah);
void ath9k_hw_btcoex_init_mci(struct ath_hw *ah); void ath9k_hw_btcoex_init_mci(struct ath_hw *ah);
void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum); void ath9k_hw_init_btcoex_hw(struct ath_hw *ah, int qnum);
void ath9k_hw_btcoex_set_weight(struct ath_hw *ah, void ath9k_hw_btcoex_set_weight(struct ath_hw *ah,
......
...@@ -40,6 +40,8 @@ void ath_deinit_leds(struct ath_softc *sc) ...@@ -40,6 +40,8 @@ void ath_deinit_leds(struct ath_softc *sc)
ath_led_brightness(&sc->led_cdev, LED_OFF); ath_led_brightness(&sc->led_cdev, LED_OFF);
led_classdev_unregister(&sc->led_cdev); led_classdev_unregister(&sc->led_cdev);
ath9k_hw_gpio_free(sc->sc_ah, sc->sc_ah->led_pin);
} }
void ath_init_leds(struct ath_softc *sc) void ath_init_leds(struct ath_softc *sc)
...@@ -404,6 +406,13 @@ void ath9k_deinit_btcoex(struct ath_softc *sc) ...@@ -404,6 +406,13 @@ void ath9k_deinit_btcoex(struct ath_softc *sc)
if (ath9k_hw_mci_is_enabled(ah)) if (ath9k_hw_mci_is_enabled(ah))
ath_mci_cleanup(sc); ath_mci_cleanup(sc);
else {
enum ath_btcoex_scheme scheme = ath9k_hw_get_btcoex_scheme(ah);
if (scheme == ATH_BTCOEX_CFG_2WIRE ||
scheme == ATH_BTCOEX_CFG_3WIRE)
ath9k_hw_btcoex_deinit(sc->sc_ah);
}
} }
int ath9k_init_btcoex(struct ath_softc *sc) int ath9k_init_btcoex(struct ath_softc *sc)
......
...@@ -253,6 +253,8 @@ void ath9k_deinit_leds(struct ath9k_htc_priv *priv) ...@@ -253,6 +253,8 @@ void ath9k_deinit_leds(struct ath9k_htc_priv *priv)
ath9k_led_brightness(&priv->led_cdev, LED_OFF); ath9k_led_brightness(&priv->led_cdev, LED_OFF);
led_classdev_unregister(&priv->led_cdev); led_classdev_unregister(&priv->led_cdev);
cancel_work_sync(&priv->led_work); cancel_work_sync(&priv->led_work);
ath9k_hw_gpio_free(priv->ah, priv->ah->led_pin);
} }
......
...@@ -1585,6 +1585,7 @@ static void ath9k_hw_apply_gpio_override(struct ath_hw *ah) ...@@ -1585,6 +1585,7 @@ static void ath9k_hw_apply_gpio_override(struct ath_hw *ah)
ath9k_hw_gpio_request_out(ah, i, NULL, ath9k_hw_gpio_request_out(ah, i, NULL,
AR_GPIO_OUTPUT_MUX_AS_OUTPUT); AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
ath9k_hw_set_gpio(ah, i, !!(ah->gpio_val & BIT(i))); ath9k_hw_set_gpio(ah, i, !!(ah->gpio_val & BIT(i)));
ath9k_hw_gpio_free(ah, i);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment