ath6kl: add ability to set debug uart baud rate

It's useful to permit the customization of the debug uart baud rate. Enable
this and send down the value to the chip if we're enabling debug.

Signed-off-by: Steve deRosier <steve.derosier@lairdtech.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath6kl/core.c b/drivers/net/wireless/ath/ath6kl/core.c
index 4ec02cea0f430830a7f063c0baff3b5baeed9fef..ebb9f163710fa4042160b35e8da2a2f9944d9761 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/core.c
+++ b/drivers/net/wireless/ath/ath6kl/core.c
@@ -31,6 +31,7 @@ unsigned int debug_mask;
 static unsigned int suspend_mode;
 static unsigned int wow_mode;
 static unsigned int uart_debug;
+static unsigned int uart_rate = 115200;
 static unsigned int ath6kl_p2p;
 static unsigned int testmode;
 static unsigned int recovery_enable;
@@ -40,6 +41,7 @@ module_param(debug_mask, uint, 0644);
 module_param(suspend_mode, uint, 0644);
 module_param(wow_mode, uint, 0644);
 module_param(uart_debug, uint, 0644);
+module_param(uart_rate, uint, 0644);
 module_param(ath6kl_p2p, uint, 0644);
 module_param(testmode, uint, 0644);
 module_param(recovery_enable, uint, 0644);
@@ -180,6 +182,7 @@ int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type)
 
        if (uart_debug)
                ar->conf_flags |= ATH6KL_CONF_UART_DEBUG;
+       ar->hw.uarttx_rate = uart_rate;
 
        set_bit(FIRST_BOOT, &ar->flag);
 

diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h
index 713a571a27ce3b0dc8c02d8d0f6a4599d74f6190..7a1970e484a6d0adcd7508e0793640cb4512cd79 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/core.h
+++ b/drivers/net/wireless/ath/ath6kl/core.h
@@ -781,6 +781,7 @@ struct ath6kl {
                u32 board_addr;
                u32 refclk_hz;
                u32 uarttx_pin;
+               u32 uarttx_rate;
                u32 testscript_addr;
                u8 tx_ant;
                u8 rx_ant;

diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 3daeb27978ee2b8f5ea0865da3c2100e8f83e1a6..58fb227a849f68e3aaa918b80ba2a0e1596bbfc3 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -651,6 +651,14 @@ int ath6kl_configure_target(struct ath6kl *ar)
        if (status)
                return status;
 
+       /* Only set the baud rate if we're actually doing debug */
+       if (ar->conf_flags & ATH6KL_CONF_UART_DEBUG) {
+               status = ath6kl_bmi_write_hi32(ar, hi_desired_baud_rate,
+                                              ar->hw.uarttx_rate);
+               if (status)
+                       return status;
+       }
+
        /* Configure target refclk_hz */
        if (ar->hw.refclk_hz != 0) {
                status = ath6kl_bmi_write_hi32(ar, hi_refclk_hz,