mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
linux: rtw88: rebase patch for 6.1.16
This commit is contained in:
parent
dd3231db00
commit
e39f9656e0
@ -1547,7 +1547,7 @@ diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/rea
|
|||||||
index 4e5c194aac29..bf1291902661 100644
|
index 4e5c194aac29..bf1291902661 100644
|
||||||
--- a/drivers/net/wireless/realtek/rtw88/mac.c
|
--- a/drivers/net/wireless/realtek/rtw88/mac.c
|
||||||
+++ b/drivers/net/wireless/realtek/rtw88/mac.c
|
+++ b/drivers/net/wireless/realtek/rtw88/mac.c
|
||||||
@@ -269,10 +269,18 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)
|
@@ -269,15 +269,23 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)
|
||||||
if (pwr_on == cur_pwr)
|
if (pwr_on == cur_pwr)
|
||||||
return -EALREADY;
|
return -EALREADY;
|
||||||
|
|
||||||
@ -1561,6 +1561,11 @@ index 4e5c194aac29..bf1291902661 100644
|
|||||||
if (rtw_pwr_seq_parser(rtwdev, pwr_seq))
|
if (rtw_pwr_seq_parser(rtwdev, pwr_seq))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
if (pwr_on)
|
||||||
|
set_bit(RTW_FLAG_POWERON, rtwdev->flags);
|
||||||
|
else
|
||||||
|
clear_bit(RTW_FLAG_POWERON, rtwdev->flags);
|
||||||
|
|
||||||
+ rtw_hci_power_switch(rtwdev, pwr_on);
|
+ rtw_hci_power_switch(rtwdev, pwr_on);
|
||||||
+
|
+
|
||||||
return 0;
|
return 0;
|
||||||
@ -1826,7 +1831,7 @@ index 8e1fa824b32b..ad71f9838d1d 100644
|
|||||||
u8 rpwm;
|
u8 rpwm;
|
||||||
bool cur_pwr;
|
bool cur_pwr;
|
||||||
|
|
||||||
@@ -278,12 +301,19 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)
|
@@ -278,17 +301,24 @@ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)
|
||||||
*/
|
*/
|
||||||
rtw_hci_power_switch(rtwdev, false);
|
rtw_hci_power_switch(rtwdev, false);
|
||||||
|
|
||||||
@ -1840,6 +1845,11 @@ index 8e1fa824b32b..ad71f9838d1d 100644
|
|||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
|
if (pwr_on)
|
||||||
|
set_bit(RTW_FLAG_POWERON, rtwdev->flags);
|
||||||
|
else
|
||||||
|
clear_bit(RTW_FLAG_POWERON, rtwdev->flags);
|
||||||
|
|
||||||
rtw_hci_power_switch(rtwdev, pwr_on);
|
rtw_hci_power_switch(rtwdev, pwr_on);
|
||||||
|
|
||||||
+ rtw_write32(rtwdev, REG_SDIO_HIMR, imr);
|
+ rtw_write32(rtwdev, REG_SDIO_HIMR, imr);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user