jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 05:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7583 from heitbaum/kernel61

Browse Source 
linux: update to 6.1.y
This commit is contained in:
CvH 2023-03-10 11:16:03 +01:00 committed by GitHub
commit 291de98cab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/linux/package.mk
View File

@ -29,8 +29,8 @@ case "${LINUX}" in
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
;; ;;
*) *)
PKG_VERSION="6.1.14" PKG_VERSION="6.1.16"
PKG_SHA256="a27076011efec7ad11e9ed0644f512c34cab4c5ed5ba42cfe71c83fabebe810d" PKG_SHA256="a6849c55580b5515a07b6ad21861c450fa20345c66624eecb89e8873816da3c5"
PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_PATCH_DIRS="default" PKG_PATCH_DIRS="default"
;; ;;

14
packages/linux/patches/default/linux-122-rtw88-rfc-v1.patch
View File

@ -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;
@ -1560,6 +1560,11 @@ index 4e5c194aac29..bf1291902661 100644
pwr_seq = pwr_on ? chip->pwr_on_seq : chip->pwr_off_seq; pwr_seq = pwr_on ? chip->pwr_on_seq : chip->pwr_off_seq;
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);
+ +
@ -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);