diff mbox series

rtw88: use the correct bit in the REG_HCI_OPT_CTRL register

Message ID YmLAzuyPr0P4Y6BP@ns.kevlo.org (mailing list archive)
State Accepted
Commit fc6234d7e2e322e84ed3c5c6c05a54f611faa9ab
Delegated to: Kalle Valo
Headers show
Series rtw88: use the correct bit in the REG_HCI_OPT_CTRL register | expand

Commit Message

Kevin Lo April 22, 2022, 2:50 p.m. UTC
Write the BIT_USB_SUS_DIS bit rather than BIT_BT_DIG_CLK_EN to the
REG_HCI_OPT_CTRL register for fixing failure to PCIe power on.

Signed-off-by: Kevin Lo <kevlo@kevlo.org>
---

Comments

Ping-Ke Shih April 24, 2022, 11:49 p.m. UTC | #1
On Fri, 2022-04-22 at 22:50 +0800, Kevin Lo wrote:
> Write the BIT_USB_SUS_DIS bit rather than BIT_BT_DIG_CLK_EN to the
> REG_HCI_OPT_CTRL register for fixing failure to PCIe power on.
> 
> Signed-off-by: Kevin Lo <kevlo@kevlo.org>

Acked-by: Ping-Ke Shih <pkshih@realtek.com>

> ---
> diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/realtek/rtw88/mac.c
> index d1678aed9d9c..caf2603da2d6 100644
> --- a/drivers/net/wireless/realtek/rtw88/mac.c
> +++ b/drivers/net/wireless/realtek/rtw88/mac.c
> @@ -75,7 +75,7 @@ static int rtw_mac_pre_system_cfg(struct rtw_dev *rtwdev)
>  
>  	switch (rtw_hci_type(rtwdev)) {
>  	case RTW_HCI_TYPE_PCIE:
> -		rtw_write32_set(rtwdev, REG_HCI_OPT_CTRL, BIT_BT_DIG_CLK_EN);
> +		rtw_write32_set(rtwdev, REG_HCI_OPT_CTRL, BIT_USB_SUS_DIS);
>  		break;
>  	case RTW_HCI_TYPE_USB:
>  		break;
> ------Please consider the environment before printing this e-mail.
Kalle Valo April 27, 2022, 4:58 a.m. UTC | #2
Kevin Lo <kevlo@kevlo.org> wrote:

> Write the BIT_USB_SUS_DIS bit rather than BIT_BT_DIG_CLK_EN to the
> REG_HCI_OPT_CTRL register for fixing failure to PCIe power on.
> 
> Signed-off-by: Kevin Lo <kevlo@kevlo.org>
> Acked-by: Ping-Ke Shih <pkshih@realtek.com>
> 
> diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/realtek/rtw88/mac.c
> index d1678aed9d9c..caf2603da2d6 100644
> --- a/drivers/net/wireless/realtek/rtw88/mac.c
> +++ b/drivers/net/wireless/realtek/rtw88/mac.c
> @@ -75,7 +75,7 @@ static int rtw_mac_pre_system_cfg(struct rtw_dev *rtwdev)
>  
>  	switch (rtw_hci_type(rtwdev)) {
>  	case RTW_HCI_TYPE_PCIE:
> -		rtw_write32_set(rtwdev, REG_HCI_OPT_CTRL, BIT_BT_DIG_CLK_EN);
> +		rtw_write32_set(rtwdev, REG_HCI_OPT_CTRL, BIT_USB_SUS_DIS);
>  		break;
>  	case RTW_HCI_TYPE_USB:
>  		break;

Patch applied to wireless-next.git, thanks.

fc6234d7e2e3 rtw88: use the correct bit in the REG_HCI_OPT_CTRL register
diff mbox series

Patch

diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/realtek/rtw88/mac.c
index d1678aed9d9c..caf2603da2d6 100644
--- a/drivers/net/wireless/realtek/rtw88/mac.c
+++ b/drivers/net/wireless/realtek/rtw88/mac.c
@@ -75,7 +75,7 @@  static int rtw_mac_pre_system_cfg(struct rtw_dev *rtwdev)
 
 	switch (rtw_hci_type(rtwdev)) {
 	case RTW_HCI_TYPE_PCIE:
-		rtw_write32_set(rtwdev, REG_HCI_OPT_CTRL, BIT_BT_DIG_CLK_EN);
+		rtw_write32_set(rtwdev, REG_HCI_OPT_CTRL, BIT_USB_SUS_DIS);
 		break;
 	case RTW_HCI_TYPE_USB:
 		break;