From e39f9656e03bdd6152fdc6c53fbfc9ebc773fd14 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Thu, 9 Mar 2023 07:44:03 +0000
Subject: [PATCH 1/3] linux: rtw88: rebase patch for 6.1.16

---
 .../patches/default/linux-122-rtw88-rfc-v1.patch   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/linux/patches/default/linux-122-rtw88-rfc-v1.patch b/packages/linux/patches/default/linux-122-rtw88-rfc-v1.patch
index d7fcc326dc..362e6787f5 100644
--- a/packages/linux/patches/default/linux-122-rtw88-rfc-v1.patch
+++ b/packages/linux/patches/default/linux-122-rtw88-rfc-v1.patch
@@ -1547,7 +1547,7 @@ diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wireless/rea
 index 4e5c194aac29..bf1291902661 100644
 --- a/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)
  		return -EALREADY;
  
@@ -1560,6 +1560,11 @@ index 4e5c194aac29..bf1291902661 100644
  	pwr_seq = pwr_on ? chip->pwr_on_seq : chip->pwr_off_seq;
  	if (rtw_pwr_seq_parser(rtwdev, pwr_seq))
  		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);
 +
@@ -1826,7 +1831,7 @@ index 8e1fa824b32b..ad71f9838d1d 100644
  	u8 rpwm;
  	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);
  
@@ -1840,6 +1845,11 @@ index 8e1fa824b32b..ad71f9838d1d 100644
  		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_write32(rtwdev, REG_SDIO_HIMR, imr);

From 2c7b4ed0d307dfaf4e29346f093a9c40f8743c24 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 11 Mar 2023 15:39:34 +0000
Subject: [PATCH 2/3] linux (Generic): update .config for 6.1.17

---
 projects/Generic/linux/linux.x86_64.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index fd7d1706ca..3c65b0ec8e 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -4478,7 +4478,6 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
-CONFIG_DRM_USE_DYNAMIC_DEBUG=y
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set
@@ -4847,6 +4846,7 @@ CONFIG_SND_HDA_CODEC_SI3054=m
 CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 # CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set
+# CONFIG_SND_HDA_CTL_DEV_ID is not set
 # end of HD-Audio
 
 CONFIG_SND_HDA_CORE=m

From e499c2b372da67736bcd7e70ea72141179195f01 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 3 Mar 2023 11:29:30 +0000
Subject: [PATCH 3/3] linux: update to 6.1.18

---
 packages/linux/package.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index bd973bc51a..a7e5abae5e 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -29,8 +29,8 @@ case "${LINUX}" in
     PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
     ;;
   *)
-    PKG_VERSION="6.1.14"
-    PKG_SHA256="a27076011efec7ad11e9ed0644f512c34cab4c5ed5ba42cfe71c83fabebe810d"
+    PKG_VERSION="6.1.18"
+    PKG_SHA256="842ac15eff0e6fb0c150fdf83f4f6aaf6b4c1239dcf8c14e2227620ec0ae141e"
     PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
     PKG_PATCH_DIRS="default"
     ;;