ath10k: move uart pin config into hw_params

This will make it possible to easily support
different hardware with different uart pin
configuration.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index e038e3e449717ea4f7219601a1d3ac1d6a0fbfdc..54fdc716597cf847d8b6d0d4ce227008e2d813c7 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -49,6 +49,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .id = QCA988X_HW_2_0_VERSION,
                .name = "qca988x hw2.0",
                .patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,
+               .uart_pin = 7,
                .fw = {
                        .dir = QCA988X_HW_2_0_FW_DIR,
                        .fw = QCA988X_HW_2_0_FW_FILE,
@@ -766,7 +767,7 @@ static int ath10k_init_uart(struct ath10k *ar)
        if (!uart_print)
                return 0;
 
-       ret = ath10k_bmi_write32(ar, hi_dbg_uart_txpin, 7);
+       ret = ath10k_bmi_write32(ar, hi_dbg_uart_txpin, ar->hw_params.uart_pin);
        if (ret) {
                ath10k_warn(ar, "could not enable UART prints (%d)\n", ret);
                return ret;

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 2de5a0c6d7254a65796da3ba335b12c9615ff36c..44bee8850586e388b80b5675970f9f270be08824 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -483,6 +483,7 @@ struct ath10k {
                u32 id;
                const char *name;
                u32 patch_load_addr;
+               int uart_pin;
 
                struct ath10k_hw_params_fw {
                        const char *dir;